[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm at torproject.org]

commit f6890422aa954ea2dd23bc4bc55f5716e88dcd7e
Merge: 8e81d329e 1bbe75da6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 3 13:37:37 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 doc/tor.1.txt | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)