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

[nickm at torproject.org]

commit 0fc171a47be0cb3b1021816ab80ef823063ce2d1
Merge: 1868982de a26a2735b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 15 12:20:57 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27081 | 4 ++++
 configure.ac     | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)