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

[nickm at torproject.org]

commit e4d7f97c401c79218d2ef88ba9db117d677bcc8f
Merge: 9c96dbe 78dfa76
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 7 10:51:28 2017 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5

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