[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

[arma at torproject.org]

commit ed960eaa16b23e42e7d959139e0001ef60aaee79
Merge: dab4656 c3800f6
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Feb 25 16:37:44 2014 -0500

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/bug10870 |    6 ++++
 src/or/or.h      |   19 -------------
 src/or/relay.c   |   83 +++++-------------------------------------------------
 3 files changed, 13 insertions(+), 95 deletions(-)