[tor-commits] [tor/master] Merge branch 'ticket25296_032_squashed' into maint-0.3.2

[nickm at torproject.org]

commit 124e06e85cf72152e9bdbd91e3cd6da9a5b1fd39
Merge: df519e5de c2d93e8a7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 5 12:08:53 2018 -0400

    Merge branch 'ticket25296_032_squashed' into maint-0.3.2

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