commit a368cadf9514cf31deebed8613c4fd833b1448bf Merge: 6247f5a5b c3a0cdeaa Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 11 12:11:42 2017 -0400

Merge branch 'bug18982'

changes/bug18982 | 6 ++++++ src/or/circuitbuild.c | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-)