summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2013-01-15 11:54:52 -0500
committerRoger Dingledine <arma@torproject.org>2013-01-15 11:54:52 -0500
commitceb797c4b72130787b4462c6887abb924138248a (patch)
treef222b72ac87f06f76201584958497c71f20f3a1a
parentbeca92c31bed468be2db52c649f7276486e4018e (diff)
downloadtor-ceb797c4b72130787b4462c6887abb924138248a.tar.gz
tor-ceb797c4b72130787b4462c6887abb924138248a.zip
fold in new change stanza
-rw-r--r--ChangeLog10
-rw-r--r--changes/bug79596
2 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index de9745540b..dc583f2d10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-Changes in version 0.2.4.9-alpha - 2013-01-??
+Changes in version 0.2.4.9-alpha - 2013-01-15
+ Tor 0.2.4.9-alpha provides a quick fix to make the new ntor handshake
+ work more robustly.
+
+ o Major bugfixes:
+ - Fix backward compatibility logic when receiving an embedded ntor
+ handshake tunneled in a CREATE cell. This clears up the "Bug:
+ couldn't format CREATED cell" warning. Fixes bug 7959; bugfix
+ on 0.2.4.8-alpha.
Changes in version 0.2.4.8-alpha - 2013-01-14
diff --git a/changes/bug7959 b/changes/bug7959
deleted file mode 100644
index 80cd8669ad..0000000000
--- a/changes/bug7959
+++ /dev/null
@@ -1,6 +0,0 @@
- o Major bugfixes:
- - Fix backward compatibility logic when receiving an embedded ntor
- handshake tunneled in a CREATE cell. This clears up the "Bug: couldn't
- format CREATED cell" warning. Fix for bug 7959; bugfix on
- 0.2.4.8-alpha.
-