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

[nickm at torproject.org]

commit 588be5b0286bd97ef725a070a5176c6467dd3d46
Merge: 8a8b5d590 8687d9cf4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 1 13:50:06 2017 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24115 | 4 ++++
 doc/tor.1.txt    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)