summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-11-06 18:02:03 -0500
committerNick Mathewson <nickm@torproject.org>2012-11-06 18:02:03 -0500
commitcd054ceadaa4723f076c7050160424b356b985ca (patch)
tree50d1fb68f1110242e08ef9bd09dc5c7f14187b75
parentb0688bbf49345cc294d2f4095c3ad11171a61f0e (diff)
parent11c467f6431773abaa4cced036b3bf87d4ea7f22 (diff)
downloadtor-cd054ceadaa4723f076c7050160424b356b985ca.tar.gz
tor-cd054ceadaa4723f076c7050160424b356b985ca.zip
Merge branch 'bug7285'
-rw-r--r--changes/bug72854
-rw-r--r--src/or/config.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug7285 b/changes/bug7285
new file mode 100644
index 0000000000..3c00205a4c
--- /dev/null
+++ b/changes/bug7285
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - Warn when we are binding low ports when hibernation is enabled;
+ previously we had warned when we were _advertising_ low ports with
+ hibernation enabled. Fixes bug 7285; bugfix on 0.2.3.9-alpha.
diff --git a/src/or/config.c b/src/or/config.c
index dca49f5cf4..bf32fae0e2 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5004,7 +5004,7 @@ check_server_ports(const smartlist_t *ports,
continue;
}
#ifndef _WIN32
- if (!port->no_advertise && port->port < 1024)
+ if (!port->no_listen && port->port < 1024)
++n_low_port;
#endif
} SMARTLIST_FOREACH_END(port);