[tor-commits] [tor/master] Merge remote-tracking branch 'public/no_itime_queue_025'

[nickm at torproject.org]

commit 10d4d3e2d58f94418ca9554aee251232bbaaab99
Merge: 5e0cdc5 5b55e0e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 11 11:52:35 2014 -0500

    Merge remote-tracking branch 'public/no_itime_queue_025'

 changes/bug10870 |    6 ++
 src/or/or.h      |   36 ----------
 src/or/relay.c   |  205 ++++++++++--------------------------------------------
 3 files changed, 43 insertions(+), 204 deletions(-)