[tor-commits] [tor/master] Merge remote-tracking branch 'public/no_itime_queue' into maint-0.2.4

[nickm at torproject.org]

commit c3800f631b7fb837d8eb03cc0edc4d8a6454aef9
Merge: d7950ed 3133cde
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 25 15:58:53 2014 -0500

    Merge remote-tracking branch 'public/no_itime_queue' into maint-0.2.4

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