commit fead22fb2ab2f31113ab6749ad01782aed90e95d Merge: 4c094436c 937260af6 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 9 09:08:58 2018 -0400

Merge remote-tracking branch 'mikeperry/bug25705_v3_033' into maint-0.3.3

changes/bug25705 | 5 +++++ src/or/circuituse.c | 45 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 39 insertions(+), 11 deletions(-)