diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-31 21:49:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-31 21:49:30 -0400 |
| commit | 83a859e24ced67663ea46f3bd05d53b29f6797c0 (patch) | |
| tree | e9b9971c861e4e9180db59fec5f7ef1f70e3d38f /src/or/or.h | |
| parent | 54056882235fbfea84f1e5860a71e54440a1e0b5 (diff) | |
| parent | 0a0f93d277046a524740ad110060abf8ed137b8f (diff) | |
| download | tor-83a859e24ced67663ea46f3bd05d53b29f6797c0.tar.gz tor-83a859e24ced67663ea46f3bd05d53b29f6797c0.zip | |
Merge remote-tracking branch 'origin/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 06363fa360..a6a4bcc1ba 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3784,7 +3784,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? */ |