Merge remote-tracking branch 'public/no_itime_queue' into maint-0.2.4
commitc3800f631b7fb837d8eb03cc0edc4d8a6454aef9
authorNick Mathewson <nickm@torproject.org>
Tue, 25 Feb 2014 20:58:53 +0000 (25 15:58 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 25 Feb 2014 20:58:53 +0000 (25 15:58 -0500)
tree376d6772f13c35bbab99afd834736e752b979e8b
parentd7950eda2bfd927a18df4a2620952d10dda1705c
parent3133cde3c12a814fab4c83ba59d5dfeace397ebc
Merge remote-tracking branch 'public/no_itime_queue' into maint-0.2.4
src/or/relay.c