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

[nickm@xxxxxxxxxxxxxx]

commit 40bccc20042fcc4f43964b358257470830169e73
Merge: a56cfda dec7998
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jun 8 09:21:15 2017 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.6

 changes/trove-2017-005 | 7 +++++++
 src/or/relay.c         | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)




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