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

[nickm at torproject.org]

commit 8f798b686d0d699c55a20ef19fe57dd487b3aa69
Merge: ec8ee5412 e3ad4957a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 5 08:20:15 2018 -0400

    Merge branch 'bug25679_033_squashed' into maint-0.3.3

 changes/bug25679 |  4 ++++
 configure.ac     | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)