[tor-commits] [tor/master] Merge remote-tracking branch 'arma/feature13211'

[nickm at torproject.org]

commit 6c6ea8c4251d38386043f26c65a7ab434b2f150a
Merge: d338229 09183dc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 22 10:49:10 2014 -0400

    Merge remote-tracking branch 'arma/feature13211'

 changes/feature13211     |    6 ++++++
 src/or/circuituse.c      |    9 ++++++---
 src/or/connection_edge.c |    3 ++-
 3 files changed, 14 insertions(+), 4 deletions(-)