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

[nickm at torproject.org]

commit f95f6a44982bd8130a840b564501ed8d87e92bb6
Merge: 50406c272 4d8de6c6b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 13 13:09:15 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/ticket25248 |   4 +
 doc/tor.1.txt       | 225 ++++++++++++++++++++++++++++++----------------------
 2 files changed, 134 insertions(+), 95 deletions(-)