commit b6dce6cfec20f2e23bf60533aa0e2f23fc1daac5 Merge: d31209a 1bc440e Author: Nick Mathewson <nickm at torproject.org> Date: Wed Jan 18 10:44:35 2017 -0500 Merge remote-tracking branch 'asn/bug21142' changes/bug21142 | 4 ++++ src/or/circuitlist.c | 3 +++ 2 files changed, 7 insertions(+)