summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-09-19 14:21:12 -0400
committerNick Mathewson <nickm@torproject.org>2016-09-19 14:21:12 -0400
commit144bd86570ee2afc4efd8ecd7c59a65973452064 (patch)
treebef537003e4fe5bc63d6d17ee33c7e98a3f607d0
parentb08ddb60c9a2bfb133889a399d4e6d01af5a59d9 (diff)
parent42a74f707c3031dab2aa21983040f58ba7b190e4 (diff)
downloadtor-144bd86570ee2afc4efd8ecd7c59a65973452064.tar.gz
tor-144bd86570ee2afc4efd8ecd7c59a65973452064.zip
Merge remote-tracking branch 'teor/bug20117'
-rw-r--r--changes/bug201176
-rw-r--r--doc/tor.1.txt5
2 files changed, 9 insertions, 2 deletions
diff --git a/changes/bug20117 b/changes/bug20117
new file mode 100644
index 0000000000..653226068b
--- /dev/null
+++ b/changes/bug20117
@@ -0,0 +1,6 @@
+ o Minor bugfixes (documentation):
+ - Document the default PathsNeededToBuildCircuits value that's
+ used by clients when the directory authorities don't set
+ min_paths_for_circs_pct.
+ Fixes bug 20117; bugfix on 02c320916e02 in tor-0.2.4.10-alpha.
+ Patch by teor, reported by Jesse V.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index eb65bf9811..2e73b2784c 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1562,8 +1562,9 @@ The following options are useful only for clients (that is, if
that fraction of possible paths. Note that setting this option too low
can make your Tor client less anonymous, and setting it too high can
prevent your Tor client from bootstrapping. If this option is negative,
- Tor will use a default value chosen by the directory
- authorities. (Default: -1.)
+ Tor will use a default value chosen by the directory authorities. If the
+ directory authorities do not choose a value, Tor will default to 0.6.
+ (Default: -1.)
[[ClientBootstrapConsensusAuthorityDownloadSchedule]] **ClientBootstrapConsensusAuthorityDownloadSchedule** __N__,__N__,__...__::
Schedule for when clients should download consensuses from authorities