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

[nickm at torproject.org]

commit 8f6e89754b81fcc01c203bdb49f38ffc19bc4918
Merge: 19ed669 c1e4aff
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 7 10:51:28 2017 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

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