[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4

[nickm at torproject.org]

commit 4a9ccb5d59d88f3026460802ee8209b79d709931
Merge: dcb4f22 efa342f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 18 10:28:43 2013 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4

 changes/bug9002       |    4 ++
 changes/bug9063_redux |   15 ++++++++
 changes/bug9072       |    3 ++
 doc/tor.1.txt         |    9 +++++
 src/common/mempool.h  |    2 +
 src/or/circuitlist.c  |  102 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/or/circuitlist.h  |    1 +
 src/or/config.c       |    8 ++++
 src/or/or.h           |    4 ++
 src/or/relay.c        |   38 +++++++++++++++++-
 src/or/relay.h        |    1 +
 src/or/rendcommon.c   |   25 +++++++++++-
 12 files changed, 208 insertions(+), 4 deletions(-)