tor

commit 9536c0b0f2e1fb65685471b1728e35ffb61c18f5
parent 0cccc7223c52512b5e0f47819f1a02740e5dad9b
Author: David Goulet <dgoulet@torproject.org>
Date:   Tue,  9 Jan 2024 09:09:44 -0500

Merge branch 'maint-0.4.8'

Diffstat:
M
ChangeLog
 | 
4
++++
M
ReleaseNotes
 | 
4
++++

2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -216,6 +216,10 @@ Changes in version 0.4.8.3-rc - 2023-08-04
     - Update the geoip files to match the IPFire Location Database, as
       retrieved on 2023/08/04.
 
+  o Minor features (bridge):
+    - warn when a bridge is also configure to be an exit relay.
+      Closes ticket 40819.
+
   o Minor bugfixes (compilation):
     - Fix all -Werror=enum-int-mismatch warnings. No behavior change.
       Fixes bug 40824; bugfix on 0.3.5.1-alpha.
diff --git a/ReleaseNotes b/ReleaseNotes
@@ -214,6 +214,10 @@ Changes in version 0.4.8.4 - 2023-08-23
       wouldn't have any middle nodes left to choose from so we would fail to
       make onion-related circuits. Fixes bug 40805; bugfix on 0.4.7.1-alpha.
 
+  o Minor features (bridge):
+    - warn when a bridge is also configure to be an exit relay.
+      Closes ticket 40819.
+
   o Minor features (geoip data):
     - Update the geoip files to match the IPFire Location Database, as
       retrieved on 2023/08/23.