Merge branch 'NetHack-3.6'

diff --cc doc/Guidebook.mn
index 3c36c0b0954be115bf4d7819e4337b0cbbf3ac2a,4c4cd5f117eeb72d17ec5de719c3cbae93a4b974..edf765d8e152a5e337c2f2d0e5bc18abedaaf793
--- 1/doc/Guidebook.mn
--- 2/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@@ -21,10 -21,10 +21,10 @@@
  .ds h0 "NetHack Guidebook
  .ds h1
  .ds h2 %
 -.ds vr "NetHack 3.6
 +.ds vr "NetHack 3.7
  .ds f0 "\*(vr
  .ds f1
- .ds f2 "December 1, 2019
+ .ds f2 "December 5, 2019
  .
  .\" A note on some special characters:
  .\" \(lq = left double quote

diff --cc doc/Guidebook.tex
Simple merge

diff --cc include/patchlevel.h
Simple merge