commit 6fa99ab32feda0e7866b9439fc6644693c56f134 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 20 13:35:02 2011 -0400

Oops: we need to call parse_client_ports with validate_only==0 at least once --- src/or/config.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c index 1ad4a34..7a96304 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1017,6 +1017,7 @@ options_act_reversible(const or_options_t *old_options, char **msg) #endif

if (running_tor) { + int n_client_ports=0; /* We need to set the connection limit before we can open the listeners. */ if (set_max_file_descriptors((unsigned)options->ConnLimit, &options->_ConnLimit) < 0) { @@ -1032,6 +1033,10 @@ options_act_reversible(const or_options_t *old_options, char **msg) libevent_initialized = 1; }

+ /* Adjust the client port configuration so we can launch listeners. */ + if (parse_client_ports(options, 0, msg, &n_client_ports)) + return -1; + /* Launch the listeners. (We do this before we setuid, so we can bind to * ports under 1024.) We don't want to rebind if we're hibernating. */ if (!we_are_hibernating()) {