commit 43d41194546dbf6a634648d592e97ccd10b04fda Merge: 0f4f4fdcf 3cafdeb8c Author: Nick Mathewson <nickm@torproject.org> Date: Tue May 14 11:43:10 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1004' changes/bug22210 | 7 +++++++ scripts/maint/practracker/exceptions.txt | 4 ++-- src/core/or/circuituse.c | 17 ++++++++++------- 3 files changed, 19 insertions(+), 9 deletions(-)