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

[nickm at torproject.org]

commit 920a7b37a5d05266c705a34965cbd0fb29e4da66
Merge: edfa74688 4856a6e6c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 3 07:33:45 2018 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug20424_029_minimal | 4 ++++
 configure.ac                 | 4 ++++
 2 files changed, 8 insertions(+)