[tor-commits] [tor/master] Merge branch 'maint-0.3.4'

[nickm at torproject.org]

commit b4e23dba930cbb8168151e1fe9dcf280615d6f3b
Merge: 06f3526b0 c08102ea7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 26 09:21:59 2018 -0400

    Merge branch 'maint-0.3.4'

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