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

[nickm at torproject.org]

commit 98a04984901585ed1a31032cc58d6dc3bd5dd415
Merge: ad0bc6e54 12fc4206f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 5 12:09:00 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug25296_032 |  5 +++++
 doc/tor.1.txt        | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)