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

[nickm at torproject.org]

commit 60d3a3c754b7d02e7fcb5e9cb6216fdd4062c3b2
Merge: 7e2e8ac24 ac1942ac5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 21 11:53:50 2018 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

 .gitmodules         | 2 +-
 changes/ticket25323 | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)