tor

commit 4a94d0394e846e04e88ad0bfc6ff80f2b4539fe1
parent 4697a29787d61a1acda7201d51bb69a4ab6b24e5
Author: David Goulet <dgoulet@torproject.org>
Date:   Tue, 30 Jan 2024 10:57:02 -0500

Merge branch 'maint-0.4.8'

Diffstat:
A
changes/ticket40896
 | 
3
+++
M
src/test/test_process_descs.c
 | 
12
++++++++----

2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/changes/ticket40896 b/changes/ticket40896
@@ -0,0 +1,2 @@
+  o Minor feature (authority):
+    - Reject 0.4.7.x series at the authority level. Closes ticket 40896.
+\ No newline at end of file
diff --git a/src/test/test_process_descs.c b/src/test/test_process_descs.c
@@ -54,11 +54,15 @@ test_process_descs_versions(void *arg)
     { "Tor 0.4.6.1-alpha", true },
     { "Tor 0.4.6.5", true },
     { "Tor 0.4.6.50", true }, /* Non existing one in the 0.4.6 series */
+    { "Tor 0.4.7.0-alpha-dev", true },
+    { "Tor 0.4.7.3-alpha", true },
+    { "Tor 0.4.7.12", true },
 
-    /* The 0.4.7.x series is supported. */
-    { "Tor 0.4.7.0-alpha-dev", false },
-    { "Tor 0.4.7.3-alpha", false },
-    { "Tor 0.4.7.12", false },
+    /* The 0.4.8.x series is supported. */
+    { "Tor 0.4.8.0-alpha-dev", false },
+    { "Tor 0.4.8.2-alpha", false },
+    { "Tor 0.4.8.3-rc", false },
+    { "Tor 0.4.8.12", false },
 
     // Very far in the future
     { "Tor 100.100.1.5", false },