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

[nickm at torproject.org]

commit 2dd1e21212c470e70be580a41c970380fc3c1bd9
Merge: 55777b3 4858cda
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 7 10:51:28 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

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