commit 60f13485ebd70443a16ab083971073dbb6bdadcf Merge: 63b9118 2c877d2 Author: Roger Dingledine arma@torproject.org Date: Thu Sep 5 01:47:47 2013 -0400

Merge branch 'maint-0.2.4' into release-0.2.4

changes/ticket9658 | 4 ++++ src/or/command.c | 3 +++ src/or/cpuworker.c | 5 +++++ src/or/main.c | 5 +++++ src/or/onion.c | 3 ++- src/or/rephist.c | 41 +++++++++++++++++++++++++++++++++++++++++ src/or/rephist.h | 8 ++++++-- 7 files changed, 66 insertions(+), 3 deletions(-)