[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

[nickm at torproject.org]

commit c1e4aff384c483f64c66775011719267059f6915
Merge: 5ff0f1a 5472066
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 7 10:51:28 2017 -0400

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

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