commit b0e1ddbd98038e3c7326970887c74f169701cf35 Merge: 75b4975 b210695 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Apr 15 14:48:00 2014 -0400 Merge remote-tracking branch 'public/bug11519_023' into maint-0.2.3 changes/bug11519 | 3 +++ src/or/circuituse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)