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

[nickm at torproject.org]

commit f8dad5a079ac356ef72f14cfddca2d81fd824102
Merge: 8b108935b 25226fb26
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 26 09:21:59 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/feature26372_029 | 4 ++++
 configure.ac             | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)