diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-08-15 15:36:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-08-15 15:36:04 -0400 |
| commit | d4634d1b72d660b1ea5ce9874fcd6b04a15968e9 (patch) | |
| tree | 57ee2a0b0a1b5c41d13ac455884a826b000c675e /src/or/channel.h | |
| parent | 1743144c341218e4af88423cccd2bf93e72730a1 (diff) | |
| parent | 1555876d5f27acaa9326045e33b6e2bfc1013c7f (diff) | |
| download | tor-d4634d1b72d660b1ea5ce9874fcd6b04a15968e9.tar.gz tor-d4634d1b72d660b1ea5ce9874fcd6b04a15968e9.zip | |
Merge remote-tracking branch 'majek/bug9108'
Conflicts:
src/or/circuitlist.h
Diffstat (limited to 'src/or/channel.h')
| -rw-r--r-- | src/or/channel.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/or/channel.h b/src/or/channel.h index bd99ebc933..430a0251a2 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -10,7 +10,6 @@ #define TOR_CHANNEL_H #include "or.h" -#include "tor_queue.h" #include "circuitmux.h" /* Channel handler function pointer typedefs */ |