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

[nickm at torproject.org]

commit 51bc8283a0a7d830f59ae73e0db589c933c1fecd
Merge: 524f0cd36 373b23a9e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 31 08:30:01 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26876 |  4 ++++
 configure.ac     | 32 +++++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)