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

[nickm at torproject.org]

commit 40105254840e4f460c193f262125d7ba454209a2
Merge: 4902cccab 2a6c1585b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 3 07:33:45 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

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