diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-16 11:40:19 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-16 11:40:19 -0500 |
| commit | 990a863d7ca74c84238791607b6515813b3b5633 (patch) | |
| tree | db6a28b4668e2029c00029b674e6f08c4c8264bc /src/or/or.h | |
| parent | 988b0afbd6bbb97e3ca796a608a4087888f162aa (diff) | |
| parent | 506bd6d47c9c003a94eae7132e83b682a53f0bc9 (diff) | |
| download | tor-990a863d7ca74c84238791607b6515813b3b5633.tar.gz tor-990a863d7ca74c84238791607b6515813b3b5633.zip | |
Merge branch 'ticket20831_v2'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h index d45dc687b4..d4d7a588d1 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4062,8 +4062,6 @@ typedef struct { int UseEntryGuards; int NumEntryGuards; /**< How many entry guards do we try to establish? */ - int UseEntryGuardsAsDirGuards; /** Boolean: Do we try to get directory info - * from a smallish number of fixed nodes? */ /** If 1, we use any guardfraction information we see in the * consensus. If 0, we don't. If -1, let the consensus parameter |