[or-cvs] [tor/release-0.2.2] Merge remote branch 'public/bug2060' into maint-0.2.2

[arma at torproject.org]

commit e895919b171029df4d38285b0be4483376b4ad25
Merge: cdbd6d0 12f3186
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 21 15:53:03 2010 -0500

    Merge remote branch 'public/bug2060' into maint-0.2.2

 changes/bug2060 |    4 ++++
 src/or/config.c |    6 ++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --combined src/or/config.c
index 280acc0,bd8c457..7fea850
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -787,9 -787,9 +787,9 @@@ add_default_trusted_dir_authorities(aut
        "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
      "ides orport=9090 no-v2 v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 "
        "216.224.124.114:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B",
 -    "gabelmoo orport=8080 no-v2 "
 +    "gabelmoo orport=443 no-v2 "
        "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
 -      "80.190.246.100:8180 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 +      "212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
      "dannenberg orport=443 no-v2 "
        "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
        "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
@@@ -3281,6 -3281,12 +3281,12 @@@ options_validate(or_options_t *old_opti
             "PublishServerDescriptor line.");
    }
  
+   if (options->BridgeRelay && options->DirPort) {
+     log_warn(LD_CONFIG, "Can't set a DirPort on a bridge relay; disabling "
+              "DirPort");
+     options->DirPort = 0;
+   }
+ 
    if (options->MinUptimeHidServDirectoryV2 < 0) {
      log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
                          "least 0 seconds. Changing to 0.");