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

[nickm at torproject.org]

commit ae157b79e76695b8afe580da033789ba92b7ffdf
Merge: 622a057e7 be8e56c23
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 3 07:33:45 2018 -0400

    Merge branch 'maint-0.3.4'

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