Merge remote-tracking branch 'origin/maint-0.2.3'

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.

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;
         }