commit 5d1a004e0dd0ef33f60985c47f86c255a3404a0f Merge: f503f30 59f50c8 Author: Roger Dingledine <arma@torproject.org> Date: Fri Nov 15 17:10:31 2013 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug10124 | 3 +++ changes/bug9093 | 7 +++++++ src/common/util.c | 12 +++++++++++ src/common/util.h | 1 + src/or/circuitlist.c | 56 +++++++++++++++++++++++++++++++++++++++++--------- src/or/or.h | 5 +++++ src/or/relay.c | 8 ++++++-- 7 files changed, 80 insertions(+), 12 deletions(-)