[tor-commits] [tor/master] Merge branch 'maint-0.3.0'

[nickm@xxxxxxxxxxxxxx]

commit 83135d75a3d87e4fd5f163aecb742180c01d9d0e
Merge: 9acca04 53011e3
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jun 8 09:21:15 2017 -0400

    Merge branch 'maint-0.3.0'

 changes/trove-2017-004 | 4 ++--
 changes/trove-2017-005 | 7 +++++++
 src/or/relay.c         | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)




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