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

[nickm at torproject.org]

commit 9e4b6986f997a6ecbcb07ba7a0ad9f060fd09355
Merge: 66c1bc9 0e5cf4a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 7 10:51:28 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/bug22789 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)