diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-04-27 10:08:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-04-27 10:08:32 -0400 |
| commit | 33a2fd065d1fd34eb4378fa2c8eb799ee5e7b172 (patch) | |
| tree | 6d670ac1d7f37eae00078bc5ded6b05e714c5271 /src/or/or.h | |
| parent | 224259a929e0503137ebd191d77a4783e8c1a81b (diff) | |
| parent | b4fe0a6a0321f241cc0a37ca6fc528aae33afd74 (diff) | |
| download | tor-33a2fd065d1fd34eb4378fa2c8eb799ee5e7b172.tar.gz tor-33a2fd065d1fd34eb4378fa2c8eb799ee5e7b172.zip | |
Merge branch 'dirreq'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/or/or.h b/src/or/or.h index 9e3e409af9..a09533f970 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -423,12 +423,13 @@ typedef enum { #define DIR_PURPOSE_FETCH_MICRODESC 19 #define DIR_PURPOSE_MAX_ 19 -/** True iff <b>p</b> is a purpose corresponding to uploading data to a - * directory server. */ +/** True iff <b>p</b> is a purpose corresponding to uploading + * data to a directory server. */ #define DIR_PURPOSE_IS_UPLOAD(p) \ ((p)==DIR_PURPOSE_UPLOAD_DIR || \ (p)==DIR_PURPOSE_UPLOAD_VOTE || \ - (p)==DIR_PURPOSE_UPLOAD_SIGNATURES) + (p)==DIR_PURPOSE_UPLOAD_SIGNATURES || \ + (p)==DIR_PURPOSE_UPLOAD_RENDDESC_V2) #define EXIT_PURPOSE_MIN_ 1 /** This exit stream wants to do an ordinary connect. */ @@ -5303,7 +5304,8 @@ typedef struct dir_server_t { * address information from published? */ routerstatus_t fake_status; /**< Used when we need to pass this trusted - * dir_server_t to directory_initiate_command_* + * dir_server_t to + * directory_request_set_routerstatus. * as a routerstatus_t. Not updated by the * router-status management code! **/ |