If the bridge config line doesn't specify a port, assume 443.

This makes bridge lines a bit smaller and easier for users to
understand.

Also, remove a duplicate changelog entry from the past.

svn:r19260

diff --git a/ChangeLog b/ChangeLog
index 1cddc5ebbdefcc3b5c2b8dfcdc82edfdf1ae70c0..5de4550ce96f3db2d3885ab8cdf42c8a40b43e2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
-Changes in version 0.2.1.14-??? - 2009-04-??
+Changes in version 0.2.1.14-rc - 2009-04-??
   o Security fixes:
     - Avoid crashing in the presence of certain malformed descriptors.
       Found by lark, and by automated fuzzing.
 
+  o Minor features:
+    - If the bridge config line doesn't specify a port, assume 443.
+      This makes bridge lines a bit smaller and easier for users to
+      understand.
+
   o Minor bugfixes:
     - Avoid trying to print raw memory to the logs when we decide to
       give up on downloading a given relay descriptor. Bugfix on
@@ -936,11 +941,6 @@ Changes in version 0.2.0.31 - 2008-09-03
       option as an alias for the actually-working --with-openssl-dir
       option. Fix the help documentation to recommend --with-openssl-dir.
       Based on a patch by "Dave". Bugfix on 0.2.0.1-alpha.
-    - Disallow session resumption attempts during the renegotiation
-      stage of the v2 handshake protocol. Clients should never be trying
-      session resumption at this point, but apparently some did, in
-      ways that caused the handshake to fail. Bug found by Geoff Goodell.
-      Bugfix on 0.2.0.20-rc.
     - When using the TransPort option on OpenBSD, and using the User
       option to change UID and drop privileges, make sure to open
       /dev/pf before dropping privileges. Fixes bug 782. Patch from

diff --git a/ReleaseNotes b/ReleaseNotes
index aa4d8a12045dbdc8b44dc6707458c4f00474b054..81d93b92a5c79f4465e852107f81c26af2b60eff 100644 (file)
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -252,11 +252,6 @@ Changes in version 0.2.0.31 - 2008-09-03
       option as an alias for the actually-working --with-openssl-dir
       option. Fix the help documentation to recommend --with-openssl-dir.
       Based on a patch by "Dave". Bugfix on 0.2.0.1-alpha.
-    - Disallow session resumption attempts during the renegotiation
-      stage of the v2 handshake protocol. Clients should never be trying
-      session resumption at this point, but apparently some did, in
-      ways that caused the handshake to fail. Bug found by Geoff Goodell.
-      Bugfix on 0.2.0.20-rc.
     - When using the TransPort option on OpenBSD, and using the User
       option to change UID and drop privileges, make sure to open
       /dev/pf before dropping privileges. Fixes bug 782. Patch from

diff --git a/src/or/config.c b/src/or/config.c
index caf018d27fbaae022a69a6399241f41787c4e947..06fab71a53439e463ef2dc4f170932862426cb65 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4270,8 +4270,10 @@ parse_bridge_line(const char *line, int validate_only)
     goto err;
   }
   if (!port) {
-    log_warn(LD_CONFIG, "Missing port in Bridge address '%s'",addrport);
-    goto err;
+    log_info(LD_CONFIG,
+             "Bridge address '%s' has no port; using default port 443.",
+             addrport);
+    port = 443;
   }
 
   if (smartlist_len(items)) {