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

[nickm at torproject.org]

commit c80afbacd6b36ef6cd82d9a5a14f7c6358e65acd
Merge: ef4d5d99f 0fc171a47
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 15 12:20:57 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27081 | 4 ++++
 configure.ac     | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)