diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-08 15:16:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-08 15:16:45 -0400 |
| commit | 2ecaa59bd794f1cba6a4ce3b82b73a8b4d27b2ab (patch) | |
| tree | c718f598e33b4859b3ddb26925841415632e397b /src/or/or.h | |
| parent | 781b477bc8af868661450473cdebb5d70312fd61 (diff) | |
| parent | d229025fefa6faa228d9154e391293d9d5b320d3 (diff) | |
| download | tor-2ecaa59bd794f1cba6a4ce3b82b73a8b4d27b2ab.tar.gz tor-2ecaa59bd794f1cba6a4ce3b82b73a8b4d27b2ab.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h index 3683607741..f28bb21126 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1737,8 +1737,9 @@ typedef struct dir_connection_t { typedef struct control_connection_t { connection_t base_; - uint32_t event_mask; /**< Bitfield: which events does this controller - * care about? */ + uint64_t event_mask; /**< Bitfield: which events does this controller + * care about? + * EVENT_MAX_ is >31, so we need a 64 bit mask */ /** True if we have sent a protocolinfo reply on this connection. */ unsigned int have_sent_protocolinfo:1; |