diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-31 21:48:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-31 21:48:48 -0400 |
| commit | 0a0f93d277046a524740ad110060abf8ed137b8f (patch) | |
| tree | 6f34c412941a8fb0fbd7e762114eb870b768317b /src/or/or.h | |
| parent | 5a5147dd2e5450d783de51d369378c59957733e5 (diff) | |
| parent | ff6bb13c02b3bb217ac8d48d5a20953f1b188d46 (diff) | |
| download | tor-0a0f93d277046a524740ad110060abf8ed137b8f.tar.gz tor-0a0f93d277046a524740ad110060abf8ed137b8f.zip | |
Merge remote-tracking branch 'arma/bug9354' into maint-0.2.4
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 0b8d057aaf..3dc96b9a9d 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3769,7 +3769,8 @@ typedef struct { 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? */ - int NumDirectoryGuards; /**< How many dir guards do we try to establish? */ + int NumDirectoryGuards; /**< How many dir guards do we try to establish? + * If 0, use value from NumEntryGuards. */ int RephistTrackTime; /**< How many seconds do we keep rephist info? */ int FastFirstHopPK; /**< If Tor believes it is safe, should we save a third * of our PK time by sending CREATE_FAST cells? */ |