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

[nickm at torproject.org]

commit be8e56c231755069fae03eb13a4ddd9fba4f6563
Merge: 861d69001 2a6c1585b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 3 07:33:45 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

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