diff options
author | Nick Mathewson <nickm@torproject.org> | 2015-07-16 15:47:00 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-07-16 15:47:00 -0400 |
commit | 6a08bcf530f5991ae0e2600ef01be377857b5942 (patch) | |
tree | 172201b27b625f4e2565cc801a1c4b62a23aa20f /src/or/or.h | |
parent | 2ba6542517fcff4ec4e7051870085cfdb6bc26aa (diff) | |
parent | 2f8cf524ba4e565ab613504a4c41fd724d32facc (diff) | |
download | tor-6a08bcf530f5991ae0e2600ef01be377857b5942.tar.gz tor-6a08bcf530f5991ae0e2600ef01be377857b5942.zip |
Merge remote-tracking branch 'public/ticket16543'
Diffstat (limited to 'src/or/or.h')
-rw-r--r-- | src/or/or.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/or/or.h b/src/or/or.h index 4b3762f00b..cbbfe9ddcd 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3593,10 +3593,7 @@ typedef struct { int PublishHidServDescriptors; int FetchServerDescriptors; /**< Do we fetch server descriptors as normal? */ int FetchHidServDescriptors; /**< and hidden service descriptors? */ - 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? */ |