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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.2' into maint-0.3.3

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