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

[nickm@xxxxxxxxxxxxxx]

commit 78dfa76ddcfd72015b0454e397de9a190e4e3106
Merge: ff8c230 b47249e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jul 7 10:51:28 2017 -0400

    Merge branch 'maint-0.2.4' into maint-0.2.5

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



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits