forward-port r9850 and the changelogs

(it's a band)


svn:r9853

2 files changed, 23 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 4325a6680..f748720a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,27 @@ Changes in version 0.2.0.1-alpha - 2007-??-??
       to 'getinfo addr-mappings/*'.
 
 
+Changes in version 0.1.2.12-rc - 2007-03-16
+  o Major bugfixes:
+    - Fix an infinite loop introduced in 0.1.2.7-alpha when we serve
+      directory information requested inside Tor connections (i.e. via
+      begin_dir cells). It only triggered when the same connection was
+      serving other data at the same time. Reported by seeess.
+
+  o Minor bugfixes:
+    - When creating a circuit via the controller, send a 'launched'
+      event when we're done, so we follow the spec better.
+
+
+Changes in version 0.1.2.11-rc - 2007-03-15
+  o Minor bugfixes (controller), reported by daejees:
+    - Correct the control spec to match how the code actually responds
+      to 'getinfo addr-mappings/*'.
+    - The control spec described a GUARDS event, but the code
+      implemented a GUARD event. Standardize on GUARD, but let people
+      ask for GUARDS too.
+
+
 Changes in version 0.1.2.10-rc - 2007-03-07
   o Major bugfixes (Windows):
     - Do not load the NT services library functions (which may not exist)
diff --git a/src/or/control.c b/src/or/control.c
index 8e3a2db60..58f6639c1 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1813,6 +1813,8 @@ handle_control_extendcircuit(control_connection_t *conn, uint32_t len,
 
   connection_printf_to_buf(conn, "250 EXTENDED %lu\r\n",
                              (unsigned long)circ->global_identifier);
+  if (zero_circ) /* send a 'launched' event, for completeness */
+    control_event_circuit_status(circ, CIRC_EVENT_LAUNCHED, 0);
  done:
   SMARTLIST_FOREACH(router_nicknames, char *, n, tor_free(n));
   smartlist_free(router_nicknames);