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

[nickm at torproject.org]

commit 43f31555827319077858fb3872c28764961b944a
Merge: 52846f728 ac3e389db
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 5 08:21:43 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/bug25582 |  3 +++
 changes/bug25679 |  4 ++++
 configure.ac     | 12 ++++++------
 doc/tor.1.txt    |  6 +++++-
 4 files changed, 18 insertions(+), 7 deletions(-)