fold in the changes files so far

10 files changed, 42 insertions, 41 deletions

diff --git a/ChangeLog b/ChangeLog
index a5cc499503..b1fe885059 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+Changes in version 0.2.3.23-rc - 2012-10-14
+  Tor 0.2.3.23-rc adds a new v3 directory authority, and fixes a variety
+  of smaller bugs in preparation for the release.
+
+  o New directory authorities:
+    - Add Faravahar (run by Sina Rabbani) as the ninth v3 directory
+      authority. Closes ticket 5749.
+
+  o Major bugfixes:
+    - Fix a possible crash bug when checking for deactivated circuits
+      in connection_or_flush_from_first_active_circuit(). Fixes bug 6341;
+      bugfix on 0.2.2.7-alpha. Bug report and fix received pseudonymously.
+
+  o Minor bugfixes (on 0.2.3.x):
+    - Fix two cases in src/or/transports.c where we were calling
+      fmt_addr() twice in a parameter list. Bug found by David
+      Fifield. Fixes bug 7014; bugfix on 0.2.3.9-alpha.
+    - Convert an assert in the pathbias code to a log message. The assert
+      appears to only be triggerable by Tor2Web mode. Fixes bug 6866;
+      bugfix on 0.2.3.17-beta.
+    - Fix memory leaks whenever we logged any message about the "path
+      bias" detection. Fixes bug 7022; bugfix on 0.2.3.21-rc.
+
+  o Minor bugfixes (on 0.2.2.x and earlier):
+    - When relays refuse a "create" cell because their queue of pending
+      create cells is too big (typically because their cpu can't keep up
+      with the arrival rate), send back reason "resource limit" rather
+      than reason "internal", so network measurement scripts can get a
+      more accurate picture. Bugfix on 0.1.1.11-alpha; fixes bug 7037.
+    - Correct file sizes when reading binary files on Cygwin, to avoid
+      a bug where Tor would fail to read its state file. Fixes bug 6844;
+      bugfix on 0.1.2.7-alpha.
+    - Avoid undefined behaviour when parsing the list of supported
+      rendezvous/introduction protocols in a hidden service descriptor.
+      Previously, Tor would have confused (as-yet-unused) protocol version
+      numbers greater than 32 with lower ones on many platforms. Fixes
+      bug 6827; bugfix on 0.2.0.10-alpha. Found by George Kadianakis.
+
+  o Documentation fixes:
+    - Clarify that hidden services are TCP only. Fixes bug 6024.
+
+
 Changes in version 0.2.3.22-rc - 2012-09-11
   Tor 0.2.3.22-rc fixes another opportunity for a remotely triggerable
   assertion.
diff --git a/changes/bug6024 b/changes/bug6024
deleted file mode 100644
index 743e6ef1fe..0000000000
--- a/changes/bug6024
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Documentation fixes:
-    - Clarify that hidden services are TCP only. Fixes bug 6024.
diff --git a/changes/bug6341 b/changes/bug6341
deleted file mode 100644
index 04e52c7cd3..0000000000
--- a/changes/bug6341
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Fix a possible crash bug when checking for deactivated circuits
-      in connection_or_flush_from_first_active_circuit(). Fixes bug 
-      6341; bugfix on 0.2.2.7-alpha. Bug report and fix received
-      pseudonymously.
diff --git a/changes/bug6827 b/changes/bug6827
deleted file mode 100644
index bf71d2b97c..0000000000
--- a/changes/bug6827
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Minor bugfixes:
-
-    - Avoid undefined behaviour when parsing the list of supported
-      rendezvous/introduction protocols in a hidden service
-      descriptor.  Previously, Tor would have confused (as-yet-unused)
-      protocol version numbers greater than 32 with lower ones on many
-      platforms.  Fixes bug 6827; bugfix on 0.2.0.10-alpha; found by
-      George Kadianakis.
-
diff --git a/changes/bug6844 b/changes/bug6844
deleted file mode 100644
index 338e19d9a5..0000000000
--- a/changes/bug6844
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-   - Correct file sizes when reading binary files on
-     Cygwin, to avoid a bug where Tor would fail to read its state file.
-     Fixes bug 6844; bugfix on 0.1.2.7-alpha.
diff --git a/changes/bug6866 b/changes/bug6866
deleted file mode 100644
index 561676b765..0000000000
--- a/changes/bug6866
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Convert an assert in the pathbias code to a log message. Assert
-      appears to only be triggerable by Tor2Web mode. Fixes bug 6866;
-      bugfix on 0.2.3.17-beta.
diff --git a/changes/bug7014 b/changes/bug7014
deleted file mode 100644
index 1d39103a50..0000000000
--- a/changes/bug7014
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Fix two cases in src/or/transports.c where we were calling
-      fmt_addr() twice in a parameter list. Bug found by David
-      Fifield. Fixes bug 7014; bugfix on 0.2.3.9-alpha.
-
diff --git a/changes/bug7022 b/changes/bug7022
deleted file mode 100644
index 10ac354724..0000000000
--- a/changes/bug7022
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Fix memory leaks whenever we logged any message about the "path
-      bias" detection. Fixes bug 7022; bugfix on 0.2.3.21-rc.
diff --git a/changes/bug7037 b/changes/bug7037
deleted file mode 100644
index fc3a1ad1c5..0000000000
--- a/changes/bug7037
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-    - When relays refuse a "create" cell because their queue of pending
-      create cells is too big (typically because their cpu can't keep up
-      with the arrival rate), send back reason "resource limit" rather
-      than reason "internal", so network measurement scripts can get a
-      more accurate picture. Bugfix on 0.1.1.11-alpha; fixes bug 7037.
diff --git a/changes/ticket5749 b/changes/ticket5749
deleted file mode 100644
index 0237241981..0000000000
--- a/changes/ticket5749
+++ /dev/null
@@ -1,3 +0,0 @@
-  o New directory authorities:
-    - Add Faravahar (run by Sina Rabbani) as the ninth v3 directory
-      authority. Closes ticket 5749.