[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1131'

[nickm@xxxxxxxxxxxxxx]

commit bd66a4084541aacd4bef6bf567a57c4dfbc2176a
Merge: 3b6bd768d 45be44ed9
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jun 24 13:36:36 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1131'

 changes/bug30956                         |   4 +
 changes/ticket30956_refactor             |   3 +
 doc/tor.1.txt                            |   6 +-
 scripts/maint/practracker/exceptions.txt |   3 +-
 src/feature/relay/router.c               | 203 +++++++++++++++++++++++--------
 5 files changed, 165 insertions(+), 54 deletions(-)



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