commit e3a4511049162b2560b80a70c6c2596fcb34dd34 Merge: 48b7db3 4f37919 Author: Nick Mathewson <nickm@torproject.org> Date: Wed May 11 14:12:39 2016 -0400 Merge remote-tracking branch 'public/bug18815' changes/bug18815 | 3 +++ src/or/circuituse.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)