diff --git a/ChangeLog b/ChangeLog
index 5a6f5ed220..4d28788d14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Changes in version 0.2.0.10-alpha - 2007-1?-??
+  o Minor bugfixes:
+    - Refuse to start if both ORPort and UseBridges are set. Bugfix
+      on 0.2.0.x.
+
+
 Changes in version 0.2.0.9-alpha - 2007-10-24
   o Major features (directory system):
     - Clients now download v3 consensus networkstatus documents instead
diff --git a/src/or/config.c b/src/or/config.c
index b4d7e3e87a..9997bfbe0e 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2780,6 +2780,11 @@ options_validate(or_options_t *old_options, or_options_t *options,
            "of the Internet, so they must not set Reachable*Addresses "
            "or FascistFirewall.");
 
+  if (options->UseBridges &&
+      server_mode(options))
+    REJECT("Servers must be able to freely connect to the rest "
+           "of the Internet, so they must not set UseBridges.");
+
   options->_AllowInvalid = 0;
   if (options->AllowInvalidNodes) {
     SMARTLIST_FOREACH(options->AllowInvalidNodes, const char *, cp, {