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

[nickm at torproject.org]

commit 2933f73b31a51ed4ffdb5c0f69c7b58d11c237b6
Merge: 6bd8f648b 12fc4206f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 5 12:09:00 2018 -0400

    Merge branch 'maint-0.3.3'

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