Finally remove deprecated-since-0.1.2.4-alpha EXTENDED_FORMAT synonym for EXTENDED_EVENTS

svn:r17538

diff --git a/ChangeLog b/ChangeLog
index 63238d534b26c2c290857413bbd78caba103fbc9..af727aa38c3585306f274b48d90f63df957bec2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 Changes in version 0.2.1.9-alpha - 200?-??-??
 
   o Minor features (controller):
-    - New CONSENSUS_ARRIVED event 
+    - New CONSENSUS_ARRIVED event to note when a new consensus has
+      been fetched and validated.
+    - Finally remove deprecated "EXTENEDED_FORMAT" feature.
 
 Changes in version 0.2.1.8-alpha - 2008-12-08
   o Major features:

diff --git a/src/or/control.c b/src/or/control.c
index 6ec244612adb64da0bb2a2e5bfc4b3774cbd9361..3b0ae192a595581f7627a263806acfe07af24ebe 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -2688,14 +2688,7 @@ handle_control_usefeature(control_connection_t *conn,
         verbose_names = 1;
       else if (!strcasecmp(arg, "EXTENDED_EVENTS")) /* <- documented */
         extended_events = 1;
-      else if (!strcasecmp(arg, "EXTENDED_FORMAT")) {
-        /* remove this in 0.1.2.4; EXTENDED_FORMAT only ever worked for a
-         * little while during 0.1.2.2-alpha-dev. */
-        log_warn(LD_GENERAL,
-                 "EXTENDED_FORMAT is deprecated; use EXTENDED_EVENTS "
-                 "instead.");
-        extended_events = 1;
-      } else {
+      else {
         connection_printf_to_buf(conn, "552 Unrecognized feature \"%s\"\r\n",
                                  arg);
         bad = 1;