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

[nickm at torproject.org]

commit e6602f5991cc9def107eb8723444017bcdc860d1
Merge: c101ecc 4eaca17
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 19 14:16:46 2013 -0400

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

 changes/bug7582      |    9 ++++++
 src/or/circuitlist.c |    2 +
 src/or/circuituse.c  |   13 +++++++--
 src/or/nodelist.c    |   18 +++++++++++++
 src/or/nodelist.h    |    1 +
 src/or/or.h          |    4 +++
 src/or/policies.c    |   18 +++++++++++++
 src/or/policies.h    |    2 +
 src/or/relay.c       |   68 +++++++++++++++++++++++++++++++++++++++----------
 9 files changed, 118 insertions(+), 17 deletions(-)