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

[nickm at torproject.org]

commit 3cf8aac28f58182f3408ca84be5208e0435bd9fb
Merge: 9f343f8 4858cda
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 7 10:51:28 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

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