summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-09-09 11:04:54 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-09 11:04:54 -0400
commit8eed82b3d4bc8d15bd4ec7f229717f903dd6d6c7 (patch)
tree0587bfcb5b0a84db5060b5b95f452963b774968e /changes
parentdd22ab519ab9ac7affa3bd775b6021049ebe7dd9 (diff)
parent39a017809b6e7f8f779cfa0b4ebea3c0209bef0c (diff)
downloadtor-8eed82b3d4bc8d15bd4ec7f229717f903dd6d6c7.tar.gz
tor-8eed82b3d4bc8d15bd4ec7f229717f903dd6d6c7.zip
Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5
Diffstat (limited to 'changes')
-rw-r--r--changes/bug121604
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug12160 b/changes/bug12160
new file mode 100644
index 0000000000..2a7ace3410
--- /dev/null
+++ b/changes/bug12160
@@ -0,0 +1,4 @@
+ o Bugfixes
+ - Correctly update the local mark on the controlling channel when changing
+ the address of an or_connection_t after the handshake. Fixes bug #12160;
+ bugfix on 0.2.4.4-alpha.