commit fd1d0a7d2e55f489a3744ec5180f40f8a870e163 Merge: f36656cad 937260af6 Author: Nick Mathewson nickm@torproject.org Date: Mon May 7 11:09:25 2018 -0400

Merge remote-tracking branch 'mikeperry/bug25705_v3_033'

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