[tor-commits] [tor/master] Remove extraneous EVENT_CONTROLLER_WAIT

[nickm at torproject.org]

commit 4fdec27a12d4fd51c91bb82c133b4b8bee2133df
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 11 18:41:15 2020 -0400

    Remove extraneous EVENT_CONTROLLER_WAIT
    
    This turned into a new StreamStatus value.
    
    Closes #40092. Bug not in any released Tor.
---
 src/feature/control/control_events.c | 1 -
 src/feature/control/control_events.h | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c
index f97130d020..2970745ca0 100644
--- a/src/feature/control/control_events.c
+++ b/src/feature/control/control_events.c
@@ -109,7 +109,6 @@ const struct control_event_t control_event_table[] = {
   { EVENT_HS_DESC, "HS_DESC" },
   { EVENT_HS_DESC_CONTENT, "HS_DESC_CONTENT" },
   { EVENT_NETWORK_LIVENESS, "NETWORK_LIVENESS" },
-  { EVENT_CONTROLLER_WAIT, "CONTROLLER_WAIT" },
   { 0, NULL },
 };
 
diff --git a/src/feature/control/control_events.h b/src/feature/control/control_events.h
index 82c665ac71..6e3cfef4e9 100644
--- a/src/feature/control/control_events.h
+++ b/src/feature/control/control_events.h
@@ -287,8 +287,7 @@ typedef uint64_t event_mask_t;
 #define EVENT_NETWORK_LIVENESS        0x0023
 #define EVENT_PT_LOG                  0x0024
 #define EVENT_PT_STATUS               0x0025
-#define EVENT_CONTROLLER_WAIT         0x0026
-#define EVENT_MAX_                    0x0026
+#define EVENT_MAX_                    0x0025
 
 /* sizeof(control_connection_t.event_mask) in bits, currently a uint64_t */
 #define EVENT_CAPACITY_               0x0040