commit 0b8760a8804feb5f51143dad12d50860c3e6a5bd Merge: b489e8cfe fead22fb2 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 9 09:09:01 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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