[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'teor/bug25998' into maint-0.3.3

commit 1bbe75da6db551e2c5afe32efe68eb8ea7b60048 Merge: c66b51267 d96ddf8f1 Author: Nick Mathewson <nickm@torproject.org> Date: Thu May 3 13:37:33 2018 -0400 Merge remote-tracking branch 'teor/bug25998' into maint-0.3.3 doc/tor.1.txt | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-)