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

[nickm at torproject.org]

commit 1047ef140e62a47d3d4019f6c30654ea9ef65954
Merge: 40154c1f9 676a28599
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 13 13:41:33 2018 +0100

    Merge branch 'maint-0.3.3'

 changes/bug25474 | 5 +++++
 configure.ac     | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)