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

[nickm at torproject.org]

commit 07d44bea0b3ea26bd8c0d5bed89a6ba555d5561f
Merge: 332c637 7151854
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 7 10:51:28 2017 -0400

    Merge branch 'maint-0.2.6' into release-0.2.6

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