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

[arma at torproject.org]

commit 86907ea4db5067d1fbf56275457a919d6789ba95
Merge: 6156887 2c877d2
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Sep 5 02:34:58 2013 -0400

    Merge branch 'maint-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(-)