summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-01-18 14:45:18 -0500
committerNick Mathewson <nickm@torproject.org>2012-01-18 14:45:18 -0500
commit93d3a917e878e42950faf6199205a6933a40c900 (patch)
tree65a10b7e40f52d975caa7e92f140e9caa9e67192 /changes
parentee717f35c44fa0ec3fc37ca8865a80e321105c33 (diff)
parent676bba8e0c91b7885aa8a9b7f55b008ccccfe282 (diff)
downloadtor-93d3a917e878e42950faf6199205a6933a40c900.tar.gz
tor-93d3a917e878e42950faf6199205a6933a40c900.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug4012_0223
1 files changed, 3 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).