commit c37fdc2eef0ccfeff56df5a9b7dfae9396fc643c Merge: dc516a5 2e1fe1f Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 18 10:16:47 2013 -0400

Merge branch 'bug9063_redux_023_squashed' into maint-0.2.3

changes/bug9063_redux | 15 ++++++++ doc/tor.1.txt | 9 +++++ src/common/mempool.h | 2 + src/or/circuitlist.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ src/or/circuitlist.h | 1 + src/or/config.c | 7 ++++ src/or/or.h | 4 ++ src/or/relay.c | 33 +++++++++++++++- src/or/relay.h | 1 + 9 files changed, 172 insertions(+), 2 deletions(-)