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

[nickm at torproject.org]

commit 29bd43ab03fd09e9d23b33ae4f126382008739ea
Merge: b51a822a8 64d2133a6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 19 11:26:58 2019 -0400

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

 scripts/maint/practracker/exceptions.txt | 4 ++--
 src/core/or/relay.c                      | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)