diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-10-13 14:32:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-10-13 14:32:43 -0400 |
| commit | d950e243328eaac40515b4b16ac328f6748c7a3f (patch) | |
| tree | 6b8f2c8202137a277cb3576c0153392927408a8b /src/or/or.h | |
| parent | 032e3b733f7bf304a778459597e7ed7b371234c7 (diff) | |
| parent | 9df61d7028936257538b15d1d3f8e04a370edb09 (diff) | |
| download | tor-d950e243328eaac40515b4b16ac328f6748c7a3f.tar.gz tor-d950e243328eaac40515b4b16ac328f6748c7a3f.zip | |
Merge remote-tracking branch 'public/bug11243_squashed'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 4130ea6351..3adec7a961 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1958,6 +1958,7 @@ typedef struct download_status_t { uint8_t n_download_failures; /**< Number of failures trying to download the * most recent descriptor. */ download_schedule_bitfield_t schedule : 8; + } download_status_t; /** If n_download_failures is this high, the download can never happen. */ @@ -4997,7 +4998,8 @@ typedef enum was_router_added_t { ROUTER_NOT_IN_CONSENSUS = -3, ROUTER_NOT_IN_CONSENSUS_OR_NETWORKSTATUS = -4, ROUTER_AUTHDIR_REJECTS = -5, - ROUTER_WAS_NOT_WANTED = -6 + ROUTER_WAS_NOT_WANTED = -6, + ROUTER_WAS_TOO_OLD = -7, } was_router_added_t; /********************************* routerparse.c ************************/ |