diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-18 14:45:18 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-18 14:45:18 -0500 |
| commit | 93d3a917e878e42950faf6199205a6933a40c900 (patch) | |
| tree | 65a10b7e40f52d975caa7e92f140e9caa9e67192 | |
| parent | ee717f35c44fa0ec3fc37ca8865a80e321105c33 (diff) | |
| parent | 676bba8e0c91b7885aa8a9b7f55b008ccccfe282 (diff) | |
| download | tor-93d3a917e878e42950faf6199205a6933a40c900.tar.gz tor-93d3a917e878e42950faf6199205a6933a40c900.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
| -rw-r--r-- | changes/bug4012_022 | 3 | ||||
| -rw-r--r-- | doc/tor.1.txt | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug4012_022 b/changes/bug4012_022 new file mode 100644 index 0000000000..f101db5535 --- /dev/null +++ b/changes/bug4012_022 @@ -0,0 +1,3 @@ + o Minor bugfixes (documentation): + - Document the GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays + directory authority option (introduced in Tor 0.2.2.34). diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 56e0bd019c..5ac2ba0c7b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1565,6 +1565,10 @@ DIRECTORY AUTHORITY SERVER OPTIONS votes on whether to accept relays as hidden service directories. (Default: 1) +GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays **0**|**1**:: + When this option is set to 0, do not vote to give the Guard flag to any + version of Tor vulnerable to CVE-2011-2769. (Default: 0) + HIDDEN SERVICE OPTIONS ---------------------- |