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

[nickm at torproject.org]

commit e8c1d4c8b05247e3e3cfec20ca11bafa5369bf41
Merge: 2c1afc2de 6aaafb067
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 29 15:00:46 2018 -0400

    Merge branch 'maint-0.3.3'

 doc/tor.1.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)