Merge remote-tracking branch 'origin/maint-0.2.4'

3 files changed, 19 insertions, 0 deletions

diff --git a/changes/bug9366 b/changes/bug9366
new file mode 100644
index 0000000000..acc919e77f
--- /dev/null
+++ b/changes/bug9366
@@ -0,0 +1,4 @@
+  o Minor features (usability):
+    - Warn and fail if a server is configured not to advertise any
+      ORPorts at all. (We need *something* to put in our descriptor, or
+      we just won't work.)
diff --git a/changes/bug9543 b/changes/bug9543
new file mode 100644
index 0000000000..753947f6fd
--- /dev/null
+++ b/changes/bug9543
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Avoid overflows when the user sets MaxCircuitDirtiness to a
+      ridiculously high value, by imposing a (ridiculously high) 30-day
+      maximum on MaxCircuitDirtiness.
diff --git a/changes/bug9546 b/changes/bug9546
new file mode 100644
index 0000000000..2145e35d8f
--- /dev/null
+++ b/changes/bug9546
@@ -0,0 +1,11 @@
+  o Major bugfixes:
+
+    - When a relay is extending a circuit to a bridge, it needs to send a
+      NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE
+      cell. Fixes bug 9546; bugfix on 0.2.3.6-alpha.
+
+    - Bridges send AUTH_CHALLENGE cells during their handshakes; previously
+      they did not, which prevented relays from successfully connecting
+      to a bridge for self-test or bandwidth testing. Fixes bug 9546;
+      bugfix on 0.2.3.6-alpha.
+