commit 1c1d71fe1adf9202a1e0c9e4aa35c2cb7ce1fe7b Merge: 03e3cf6 68eaaed Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 25 11:14:44 2015 -0400

Merge remote-tracking branch 'public/bug16013_025' into maint-0.2.6

changes/bug16013 | 5 +++++ src/or/circuituse.c | 12 ++++++++++++ 2 files changed, 17 insertions(+)