Merge remote-tracking branch 'tor-github/pr/1719/head' into maint-0.4.3
commitf733b8acd67f487a56e56bfb454ff99bc8d1cab0
authorNick Mathewson <nickm@torproject.org>
Thu, 20 Feb 2020 13:48:17 +0000 (20 08:48 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 20 Feb 2020 13:48:17 +0000 (20 08:48 -0500)
tree611a792d7e6ab2d9a181c453a71960298af4486a
parenta79841fd83b6d800796c04855841170c364ff2a9
parentf0964628e6e6b4f5dda6df30fbb19f74c59eccfd
Merge remote-tracking branch 'tor-github/pr/1719/head' into maint-0.4.3
doc/tor.1.txt