diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-10 15:04:23 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-10 15:04:23 -0500 |
| commit | 5b55e0e18180d96331e846b700ac194e24f43b8e (patch) | |
| tree | db7f58c7e33abae9a6e56d3a2c766d2f1f89282d /changes/bug10536 | |
| parent | a73b0da653db051275311ea791098a8a9dacc98f (diff) | |
| parent | 3133cde3c12a814fab4c83ba59d5dfeace397ebc (diff) | |
| download | tor-5b55e0e18180d96331e846b700ac194e24f43b8e.tar.gz tor-5b55e0e18180d96331e846b700ac194e24f43b8e.zip | |
Merge remote-tracking branch 'public/no_itime_queue'
The conflicts here were tricky, and required me to eliminate the
command-queue as well. That wasn't so hard.
Conflicts:
src/or/or.h
src/or/relay.c
Diffstat (limited to 'changes/bug10536')
0 files changed, 0 insertions, 0 deletions