diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-02 12:56:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-02 12:56:45 -0400 |
| commit | 0a4a3de3def27a7c7f8a514546b33662d0cfe6c5 (patch) | |
| tree | 3872a4bd54487de1985fa8d35baa83b5ced627a8 /src/or/connection.c | |
| parent | 9ac2f63e0f3f1fd333b23ee6e6c02ae7cf0f71d2 (diff) | |
| parent | df42eb0a18a9f6fe4b729a1c9a63bb6ab247f631 (diff) | |
| download | tor-0a4a3de3def27a7c7f8a514546b33662d0cfe6c5.tar.gz tor-0a4a3de3def27a7c7f8a514546b33662d0cfe6c5.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/dirserv.c
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index f59b36ab9d..81f0cdf812 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2008,7 +2008,7 @@ retry_all_listeners(smartlist_t *replaced_conns, or_options_t *options = get_options(); int retval = 0; const uint16_t old_or_port = router_get_advertised_or_port(options); - const uint16_t old_dir_port = router_get_advertised_dir_port(options); + const uint16_t old_dir_port = router_get_advertised_dir_port(options, 0); if (retry_listeners(CONN_TYPE_OR_LISTENER, options->ORListenAddress, options->ORPort, "0.0.0.0", @@ -2054,7 +2054,7 @@ retry_all_listeners(smartlist_t *replaced_conns, return -1; if (old_or_port != router_get_advertised_or_port(options) || - old_dir_port != router_get_advertised_dir_port(options)) { + old_dir_port != router_get_advertised_dir_port(options, 0)) { /* Our chosen ORPort or DirPort is not what it used to be: the * descriptor we had (if any) should be regenerated. (We won't * automatically notice this because of changes in the option, |