diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:43:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:43:06 -0400 |
| commit | dfa6cde4d4de57476ea8381199dfbac1afc245d5 (patch) | |
| tree | 73b8f1ecac21bfad33f43c7759e5dfecf43361bc /src/or/or.h | |
| parent | 5f9cdee8afd3fb0db835c19993fae476e0f00033 (diff) | |
| parent | f45261cb29504bfe39ddb96d8e7f38bb32dd37a5 (diff) | |
| download | tor-dfa6cde4d4de57476ea8381199dfbac1afc245d5.tar.gz tor-dfa6cde4d4de57476ea8381199dfbac1afc245d5.zip | |
Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 1909887bbd..2e5edff36d 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2507,8 +2507,11 @@ typedef struct { * we don't need to? */ int HidServDirectoryV2; /**< Do we participate in the HS DHT? */ + int VoteOnHidServDirectoriesV2; /**< As a directory authority, vote on + * assignment of the HSDir flag? */ int MinUptimeHidServDirectoryV2; /**< As directory authority, accept hidden * service directories after what time? */ + int FetchUselessDescriptors; /**< Do we fetch non-running descriptors too? */ int AllDirActionsPrivate; /**< Should every directory action be sent * through a Tor circuit? */ |