aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-03-15 15:19:38 -0400
committerNick Mathewson <nickm@torproject.org>2011-03-15 15:19:38 -0400
commit4dde69a6d003682217c2bf6327b5923c7b811974 (patch)
treed0debee04bbc6ba0f66d68e5e4c8c1df8a269ce7 /changes
parentc42bd529dea474db1a1af4432b9fe5552c0ca07e (diff)
parentab418447eb9838a8a6f5588e374910d753740d0f (diff)
downloadtor-4dde69a6d003682217c2bf6327b5923c7b811974.tar
tor-4dde69a6d003682217c2bf6327b5923c7b811974.tar.gz
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug27576
1 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug2757 b/changes/bug2757
new file mode 100644
index 000000000..f947afaeb
--- /dev/null
+++ b/changes/bug2757
@@ -0,0 +1,6 @@
+ - Minor bugfixes
+ o Avoid a double-mark-for-free warning when failing to attach a
+ transparent proxy connection. (We thought we had fixed this in
+ 0.2.2.23-alpha, but it turns out our fix was checking the wrong
+ connection.) Fixes bug 2757; bugfix on 0.1.2.1-alpha (the original
+ bug) and 0.2.2.23-alpha (the incorrect fix).