Merge remote-tracking branch 'public/bug4657'

Conflicts: src/or/router.c
2024-12-06 19:41:15 +01:00 · 2012-06-05 10:20:44 -04:00
parent c19a2ff691 281a5e4670
commit 1ce0c5eba9
3 changed files with 11 additions and 1 deletions
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - If the configuration tries to set MyFamily on a bridge, refuse to
+      do so, and warn about the security implications. Fix for bug 4657;
+      bugfix on 0.2.0.3-alpha.