commit 90301247fd35225cc25b6ea2568364356ff00580 Merge: 530304dd7 981bb6057 Author: teor teor@torproject.org Date: Thu Mar 14 06:37:17 2019 +1000

Merge remote-tracking branch 'tor-github/pr/765' into maint-0.2.9

changes/bug23681 | 5 +++++ src/or/circuituse.c | 18 ++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-)