4 files changed, 11 insertions, 130 deletions
diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md
index a32bb10dad..f4f1368009 100644
--- a/doc/HACKING/ReleasingTor.md
+++ b/doc/HACKING/ReleasingTor.md
@@ -132,14 +132,17 @@ do the following:
 
 ### New Stable
 
-   1. Create the `maint-x.y.z` and `release-x.y.z` branches and update the
-      `./scripts/git/git-list-tor-branches.sh` with the new version.
+   1. Create the `maint-x.y.z` and `release-x.y.z` branches at the version
+      tag. Then update the `./scripts/git/git-list-tor-branches.sh` with the
+      new version.
 
-   2. Add the new version in `./scripts/ci/ci-driver.sh`.
-
-   3. Forward port the ChangeLog and ReleaseNotes into main branch. Remove any
-      change logs of stable releases in ReleaseNotes.
+   2. Update `./scripts/git/git-list-tor-branches.sh` and
+      `./scripts/ci/ci-driver.sh` with the new version in `maint-x.y.z` and
+      then merge forward into main. (If you haven't pushed remotely the new
+      branches, merge the local branch).
 
+   3. In `main`, bump version to the next series: `tor-x.y.0-alpha-dev` and
+      then tag it: `git tag -s tor-x.y.0-alpha-dev`
 
 ## Appendix: An alternative means to notify packagers
 
diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh
index 98e216e68a..a3e2f8f9bf 100755
--- a/doc/asciidoc-helper.sh
+++ b/doc/asciidoc-helper.sh
@@ -12,7 +12,7 @@ if [ $# != 3 ]; then
     exit 1
 fi
 
-SOURCE_DATE_EPOCH="$(git show --no-patch --format='%ct')"
+SOURCE_DATE_EPOCH="$(git -C "$(dirname "$0")" show --no-patch --format='%ct')"
 export SOURCE_DATE_EPOCH
 
 output=$3
diff --git a/doc/building-tor-msvc.txt b/doc/building-tor-msvc.txt
deleted file mode 100644
index dbc644d172..0000000000
--- a/doc/building-tor-msvc.txt
+++ /dev/null
@@ -1,122 +0,0 @@
-Building Tor with MSVC.
-=======================
-
-NOTE: This is not the preferred method for building Tor on windows: we use
-mingw for our packages.
-
-Last updated 9 September 2014.
-
-
-Requirements:
--------------
-
- * Visual Studio 2010
-    https://go.microsoft.com/fwlink/?LinkId=323467
- * CMake 2.8.12.2
-    https://www.cmake.org/download/
- * Perl 5.16
-    https://www.activestate.com/activeperl/downloads
- * Latest stable OpenSSL tarball
-    https://www.openssl.org/source/
- * Latest stable zlib tarball
-    https://zlib.net/
- * Latest stable libevent Libevent tarball
-    https://github.com/libevent/libevent/releases
-
-Make sure you check signatures for all these packages.
-
-Steps:
-------
-
-Building OpenSSL from source as a shared library:
-
- cd <openssl source dir>
- perl Configure VC-WIN32
- perl util\mkfiles.pl >MINFO
- perl util\mk1mf.pl no-asm dll VC-WIN32 >32dll.mak
- perl util\mkdef.pl 32 libeay > ms\libeay32.def
- perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
- nmake -f 32dll.mak
-
-Making OpenSSL final package:
-
- Create <openssl final package dir>, I'd recommend using a name like <openssl
- source dir>-vc10.
-
- Copy the following directories and files to their respective locations
-  <openssl source dir>\inc32\openssl => <openssl final package dir>\include\openssl
-  <openssl source dir>\out32dll\libeay32.lib => <openssl final package dir>\lib\libeay32.lib
-  <openssl source dir>\out32dll\ssleay32.lib => <openssl final package dir>\lib\ssleay32.lib
-  <openssl source dir>\out32dll\libeay32.dll => <openssl final package dir>\bin\libeay32.dll
-  <openssl source dir>\out32dll\openssl.exe => <openssl final package dir>\bin\openssl.exe
-  <openssl source dir>\out32dll\ssleay32.dll => <openssl final package dir>\bin\ssleay32.dll
-
-Building Zlib from source:
-
- cd <zlib source dir>
- nmake -f win32/Makefile.msc
-
-Building libevent:
-
- cd <libevent source dir>
- mkdir build && cd build
- SET OPENSSL_ROOT_DIR=<openssl final package dir>
- cmake -G "NMake Makefiles" .. -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="/MT /Zi /O2 /Ob1 /D NDEBUG" -DZLIB_LIBRARY:FILEPATH="<zlib source dir>\zdll.lib" -DZLIB_INCLUDE_DIR:PATH="<zlib source dir>"
- nmake event
-
-Building Tor:
-
- Create a dir above tor source dir named build-alpha and two subdirs include
- and lib.
-
- Your build tree should now be similar to this one:
-  * build-alpha
-    - include
-    - lib
-  * <libevent source dir>
-    - build
-    - cmake
-    - ...
-  * <openssl source dir>
-    - ...
-    - ms
-    - util
-    - ...
-  * <openssl final package dir>
-    - bin
-    - include
-    - lib
-  * <tor source dir>
-    - ...
-    - src
-    - ...
-  * <zlib source dir>
-    - ...
-    - win32
-    - ...
-
- Copy the following dirs and files to the following locations:
-  <openssl final package dir>\include\openssl => build-alpha\include\openssl
-  <libevent source dir>\include => build-alpha\include
-  <libevent source dir>\WIN32-Code\nmake\event2 => build-alpha\include\event2
-  <zlib source dir>\z*.h => build-alpha\include\z*.h
-
- Now copy the following files to the following locations and rename them
- according new names:
-
-  <libevent source dir>\build\lib\event.lib => build-alpha\lib\libevent.lib
-  <openssl final package dir>\lib\libeay32.lib => build-alpha\lib\libcrypto.lib
-  <openssl final package dir>\lib\ssleay32.lib => build-alpha\lib\libssl.lib
-  <zlib source dir>\zdll.lib => build-alpha\lib\libz.lib
-
- And we are now ready for the build process:
-
-  cd <tor source dir>
-  nmake -f Makefile.nmake
-
- After the above process is completed there should be a tor.exe in <tor
- source dir>\src\or
-
- Copy tor.exe to desired location and also copy zlib1.dll, libeay32.dll and
- ssleay32.dll from built zlib and openssl packages
-
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index 1814801b71..6a4afc0bbd 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -3506,7 +3506,7 @@ Service side:
   configured, the service will be accessible to anyone with the onion address.
 
   Revoking a client can be done by removing their ".auth" file, however the
-  revocation will be in effect only after the tor process gets restarted even if
+  revocation will be in effect only after the tor process gets restarted or if
   a SIGHUP takes place.
 
 Client side: