summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-03-18 09:07:52 -0400
committerNick Mathewson <nickm@torproject.org>2015-03-18 09:07:52 -0400
commit90a0a0ca7ae5495cf990d7694f11e4b454e5cf6e (patch)
tree32eea351e8570e38345de0179b538e8e888b6d16
parentbbf304be26b5d677bb08d91e8c41a4ba478a1f63 (diff)
downloadtor-90a0a0ca7ae5495cf990d7694f11e4b454e5cf6e.tar.gz
tor-90a0a0ca7ae5495cf990d7694f11e4b454e5cf6e.zip
Fold everything into changelog, remove already-folded-in changes
-rw-r--r--ChangeLog4
-rw-r--r--changes/bug152406
-rw-r--r--changes/bug152455
-rw-r--r--changes/bug9495_redux4
-rw-r--r--changes/ticket151763
-rw-r--r--changes/ticket152126
6 files changed, 4 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index d1009bec8b..2e86892d82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,10 @@ Changes in version 0.2.6.5-?? - 2015-03-??
know if removing support for very old versions of the Tor
protocols is harming the network. Closes ticket 15212.
+ o Code simplification and refactoring:
+ - Refactor main loop to extract the 'loop' part. This makes it
+ easier to run Tor under Shadow. Closes ticket 15176.
+
Changes in version 0.2.5.11 - 2015-03-17
Tor 0.2.5.11 is the second stable release in the 0.2.5 series.
diff --git a/changes/bug15240 b/changes/bug15240
deleted file mode 100644
index e11f804a12..0000000000
--- a/changes/bug15240
+++ /dev/null
@@ -1,6 +0,0 @@
- o Minor bugfixes (pluggable transports):
- - Initialize the extended OR Port authentication cookie before launching
- pluggable transports. This prevents a race condition that occured when
- server-side pluggable transports would cache the authentication cookie
- before it has been (re)generated. Fixes bug 15240; bugfix on
- 0.2.5.1-alpha.
diff --git a/changes/bug15245 b/changes/bug15245
deleted file mode 100644
index 520a370eeb..0000000000
--- a/changes/bug15245
+++ /dev/null
@@ -1,5 +0,0 @@
- o Major bugfixes:
- - Avoid crashing when making certain configuration option changes
- on clients. Fixes bug 15245; bugfix on 0.2.6.3-alpha. Reported
- by "anonym".
-
diff --git a/changes/bug9495_redux b/changes/bug9495_redux
deleted file mode 100644
index 74b0cdf2a8..0000000000
--- a/changes/bug9495_redux
+++ /dev/null
@@ -1,4 +0,0 @@
- o Major bugfixes (portability):
- - Do not crash on startup when running on Solaris. Fixes a bug
- related to our fix for 9495; bugfix on 0.2.6.1-alpha. Reported
- by "ruebezahl".
diff --git a/changes/ticket15176 b/changes/ticket15176
deleted file mode 100644
index 6d12723728..0000000000
--- a/changes/ticket15176
+++ /dev/null
@@ -1,3 +0,0 @@
- o Code simplification and refactoring:
- - Refactor main loop to extract the 'loop' part. This makes it easier
- to run Tor under Shadow. Closes ticket 15176.
diff --git a/changes/ticket15212 b/changes/ticket15212
deleted file mode 100644
index 2c41e3865c..0000000000
--- a/changes/ticket15212
+++ /dev/null
@@ -1,6 +0,0 @@
- o Minor features (heartbeat):
-
- - On relays, report how many connections we negotiated using each
- version of the Tor link protocols. This information will let us
- know if removing support for very old versions of the Tor
- protocols is harming the network. Closes ticket 15212.