diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-09 11:51:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-09 11:51:18 -0400 |
| commit | 59f3cce0dcddb98301d18d0cb4cb08c1619fa34c (patch) | |
| tree | 988f823cc734aaaaf08c8fb0b40f372b4c66f4ff /src/or/or.h | |
| parent | 4af88d68b4905beac168adb5f1756d610ff7ed7e (diff) | |
| parent | 607724c696a6e1bb10c8a955dac38f0ea947ce34 (diff) | |
| download | tor-59f3cce0dcddb98301d18d0cb4cb08c1619fa34c.tar.gz tor-59f3cce0dcddb98301d18d0cb4cb08c1619fa34c.zip | |
Merge branch 'bug12899_squashed'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/or/or.h b/src/or/or.h index f28bb21126..25a8b48187 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3533,8 +3533,6 @@ typedef struct { int AuthoritativeDir; /**< Boolean: is this an authoritative directory? */ int V3AuthoritativeDir; /**< Boolean: is this an authoritative directory * for version 3 directories? */ - int NamingAuthoritativeDir; /**< Boolean: is this an authoritative directory - * that's willing to bind names? */ int VersioningAuthoritativeDir; /**< Boolean: is this an authoritative * directory that's willing to recommend * versions? */ @@ -3769,8 +3767,6 @@ typedef struct { * and vote for all other dir mirrors as good. */ int AuthDirListBadExits; /**< True iff we should list bad exits, * and vote for all other exits as good. */ - int AuthDirRejectUnlisted; /**< Boolean: do we reject all routers that - * aren't named in our fingerprint file? */ int AuthDirMaxServersPerAddr; /**< Do not permit more than this * number of servers per IP address. */ int AuthDirMaxServersPerAuthAddr; /**< Do not permit more than this |