commit d3382297fea0317880acb2c9d7d323be5027ff41 Merge: 01b23a6 530fac1 Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 22 10:42:54 2014 -0400

Merge remote-tracking branch 'arma/feature13153'

changes/feature13153 | 5 +++++ src/or/circuituse.c | 33 ++++++++++++++++----------------- src/or/or.h | 3 --- src/or/routerparse.c | 3 --- 4 files changed, 21 insertions(+), 23 deletions(-)