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/dirserv.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/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index c591d906e3..fef9450d70 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2732,7 +2732,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_env_t *private_key, voter->sigs = smartlist_create(); voter->address = hostname; voter->addr = addr; - voter->dir_port = router_get_advertised_dir_port(options); + voter->dir_port = router_get_advertised_dir_port(options, 0); voter->or_port = router_get_advertised_or_port(options); voter->contact = tor_strdup(contact); if (options->V3AuthUseLegacyKey) { @@ -2836,7 +2836,7 @@ generate_v2_networkstatus_opinion(void) "%s" /* client version line, server version line. */ "dir-signing-key\n%s", hostname, fmt_addr32(addr), - (int)router_get_advertised_dir_port(options), + (int)router_get_advertised_dir_port(options, 0), fingerprint, contact, published, |