[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

[nickm at torproject.org]

commit 5472066cd21099d406e69ef810b83c153bd21e5b
Merge: 6cd6d48 7151854
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 7 10:51:28 2017 -0400

    Merge branch 'maint-0.2.6' into maint-0.2.7-redux

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