diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-07-17 12:03:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-07-17 12:03:10 -0400 |
| commit | f9478b7a796a784a2d8f12fb9701ce7d1ea1ace2 (patch) | |
| tree | cd44f2387de5e38dc05659308a4727bfbec4acdd | |
| parent | 0b6fb5ebcdccd7267e60caf5418b31977c41f12c (diff) | |
| parent | 4cac5df5548e0051a6927a778da3e6f01f45dc56 (diff) | |
| download | tor-f9478b7a796a784a2d8f12fb9701ce7d1ea1ace2.tar.gz tor-f9478b7a796a784a2d8f12fb9701ce7d1ea1ace2.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
| -rw-r--r-- | changes/port_doc | 3 | ||||
| -rw-r--r-- | src/or/config.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/port_doc b/changes/port_doc new file mode 100644 index 0000000000..0e8662f0ab --- /dev/null +++ b/changes/port_doc @@ -0,0 +1,3 @@ + o Minor features (usability): + - Try to make the warning when giving an obsolete SOCKSListenAddress + a littel more useful. diff --git a/src/or/config.c b/src/or/config.c index 7caebaefb3..c8c9ee62d5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5642,7 +5642,7 @@ parse_port_config(smartlist_t *out, mainport = (int)tor_parse_long(ports->value, 10, 0, 65535, &ok, NULL); if (!ok) { log_warn(LD_CONFIG, "%sListenAddress can only be used with a single " - "%sPort with value \"auto\" or 1-65535.", + "%sPort with value \"auto\" or 1-65535 and no options set.", portname, portname); return -1; } |