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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.3' into maint-0.3.4

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