summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-09-27 17:52:20 -0400
committerNick Mathewson <nickm@torproject.org>2010-09-27 17:52:20 -0400
commitaf7fab020accd31f95ba2037ccd25c65e3290571 (patch)
treeece006ac592b5d153e173332d6489acc22f98058 /changes
parent5c83c06c985d314f31c72d3fb5a29c1c2f396f66 (diff)
parent8df3a909466217d6738d6fe4f7555f569b2a4cb7 (diff)
downloadtor-af7fab020accd31f95ba2037ccd25c65e3290571.tar.gz
tor-af7fab020accd31f95ba2037ccd25c65e3290571.zip
Merge remote branch 'origin/maint-0.2.2'
Conflicts: src/or/config.c
Diffstat (limited to 'changes')
-rw-r--r--changes/bug17515
-rw-r--r--changes/bug19643
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug1751 b/changes/bug1751
new file mode 100644
index 0000000000..58ea9a225f
--- /dev/null
+++ b/changes/bug1751
@@ -0,0 +1,5 @@
+ o Major features:
+ - Exit relays now try harder to block exit attempts from unknown
+ relays, to make it harder for people to use them as one-hop proxies.
+ Controlled by the refuseunknownexits consensus parameter, or you
+ can override it with the RefuseUnknownExits torrc option.
diff --git a/changes/bug1964 b/changes/bug1964
new file mode 100644
index 0000000000..d100094eba
--- /dev/null
+++ b/changes/bug1964
@@ -0,0 +1,3 @@
+ o Major bugfixes:
+ - Fix a segfault that can happen when using bridges. Fixes bug 1964;
+ bugfix on 0.2.2.15-alpha.