diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-11 11:10:23 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-11 11:10:23 -0500 |
| commit | 180ecd6a2b3ee9fe10fed760d30ac9fb72b03346 (patch) | |
| tree | 3617e708a05eb7253a49a6f083974764cfcf5cb4 /src/or/or.h | |
| parent | 7b51667d638242b9e47bdd0d4357596c380f7c94 (diff) | |
| parent | ac2f90ed001f168459afce8d137fe5e43baa173f (diff) | |
| download | tor-180ecd6a2b3ee9fe10fed760d30ac9fb72b03346.tar.gz tor-180ecd6a2b3ee9fe10fed760d30ac9fb72b03346.zip | |
Merge remote-tracking branch 'teor/nickm-bug13401'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 58e2164665..f3fee8fc73 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4105,6 +4105,11 @@ typedef struct { * regardless of uptime and bandwidth. */ routerset_t *TestingDirAuthVoteGuard; + /** Relays in a testing network which should be voted HSDir + * regardless of uptime and ORPort connectivity. + * Respects VoteOnHidServDirectoriesV2. */ + routerset_t *TestingDirAuthVoteHSDir; + /** Enable CONN_BW events. Only altered on testing networks. */ int TestingEnableConnBwEvent; |