[tor-commits] [tor/master] Merge branch 'bug9658_refactor'

[nickm at torproject.org]

commit 9efd970dd9e04177832312d6d611a855ec4e455f
Merge: 0f395a7 6ad7f34
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 27 23:00:28 2014 -0400

    Merge branch 'bug9658_refactor'

 src/or/cpuworker.c |    2 +-
 src/or/rephist.c   |   16 ++++++++--------
 src/or/rephist.h   |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)