commit bd731683070351d640e40f1a4d6320e0fe4b727e Merge: 07e1e75 1c1d71f Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 25 11:14:53 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/bug16013 | 5 +++++ src/or/circuituse.c | 12 ++++++++++++ 2 files changed, 17 insertions(+)