[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'public/bug8387_024' into maint-0.2.5

[arma at torproject.org]

commit 856114ab1c5a8a7a1b7993ee34adbb7cbf4eaa10
Merge: 35791f4 ed3d789
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 16 10:01:56 2014 +0200

    Merge remote-tracking branch 'public/bug8387_024' into maint-0.2.5

 changes/bug8387     |   11 +++++++++++
 src/or/circuituse.c |   27 ++++++++++++++++++++++-----
 src/or/circuituse.h |    1 +
 src/or/main.c       |    5 ++++-
 4 files changed, 38 insertions(+), 6 deletions(-)