[tor-commits] [tor/maint-0.2.4] Merge branch 'bug9093_023' into maint-0.2.3

[nickm at torproject.org]

commit 9e907076025ccd91abfad7fc70c09ba4c9228f82
Merge: 82d8944 1b8ceb8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 15 15:23:51 2013 -0500

    Merge branch 'bug9093_023' into maint-0.2.3

 changes/bug9093      |    7 +++++++
 src/or/circuitlist.c |   56 +++++++++++++++++++++++++++++++++++++++++---------
 src/or/or.h          |    5 +++++
 src/or/relay.c       |    8 ++++++--
 4 files changed, 64 insertions(+), 12 deletions(-)