diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-02-15 16:23:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-02-15 16:23:43 -0500 |
| commit | d6634001c9063323643e3ddfe8905c250a6d60d7 (patch) | |
| tree | 7efa13432f31719ec5b4446f4ed00d0d4d34cd51 /src/or/circuitlist.c | |
| parent | 5fcc5dfa779fcdc84cb7249749b7fbb782f15a10 (diff) | |
| parent | 076654ce8423d2b8ab7285b22c13d4002942bd8b (diff) | |
| download | tor-d6634001c9063323643e3ddfe8905c250a6d60d7.tar tor-d6634001c9063323643e3ddfe8905c250a6d60d7.tar.gz | |
Merge remote-tracking branch 'public/wide_circ_ids'
Conflicts:
src/or/channel.h
src/or/connection_or.c
src/or/cpuworker.c
Diffstat (limited to 'src/or/circuitlist.c')
| -rw-r--r-- | src/or/circuitlist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 6987dc42f..ef3268073 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -71,7 +71,7 @@ chan_circid_entries_eq_(chan_circid_circuit_map_t *a, static INLINE unsigned int chan_circid_entry_hash_(chan_circid_circuit_map_t *a) { - return (((unsigned)a->circ_id)<<8) ^ (unsigned)(uintptr_t)(a->chan); + return ((unsigned)a->circ_id) ^ (unsigned)(uintptr_t)(a->chan); } /** Map from [chan,circid] to circuit. */ |