[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.3'

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