summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-04-11 00:16:05 +0000
committerRoger Dingledine <arma@torproject.org>2009-04-11 00:16:05 +0000
commit93c0a81491b148910dd633d383d4c1218104ecca (patch)
tree077457e032f19d6364b499d5fd3ddd2ab52c106d /src/or
parent8390787a5f90609621a4a126414ad68242ff7a2a (diff)
downloadtor-93c0a81491b148910dd633d383d4c1218104ecca.tar.gz
tor-93c0a81491b148910dd633d383d4c1218104ecca.zip
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
Diffstat (limited to 'src/or')
-rw-r--r--src/or/config.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c
index caf018d27f..06fab71a53 100644
--- 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)) {