commit fdbd139495639576c233df47ae2db3becd7f43fd Merge: cf92c096a c131b0763 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 2 13:33:50 2019 -0400

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

changes/bug30958 | 5 +++++ scripts/maint/practracker/exceptions.txt | 2 +- src/feature/relay/router.c | 22 +++++++++++++++++----- 3 files changed, 23 insertions(+), 6 deletions(-)