diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-13 10:48:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-13 10:48:07 -0400 |
| commit | 600744b4be3d83a3e4924c8712bc30b7de1f4d3c (patch) | |
| tree | 9060cc5d17499fc87b93c8d14492df8cae1a9e59 /src/or/dirserv.c | |
| parent | 87c79cf01760787bcd9e8616b17babe5a7e4eca4 (diff) | |
| parent | 5f2a1a7b4f20be121cd30def95cf7789924ca70a (diff) | |
| download | tor-600744b4be3d83a3e4924c8712bc30b7de1f4d3c.tar.gz tor-600744b4be3d83a3e4924c8712bc30b7de1f4d3c.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/config.c
src/or/dirserv.c
src/or/or.h
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index d22ef3bac3..aa2e74b0be 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2726,8 +2726,8 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_env_t *private_key, voter->sigs = smartlist_create(); voter->address = hostname; voter->addr = addr; - voter->dir_port = options->DirPort; - voter->or_port = options->ORPort; + voter->dir_port = router_get_advertised_dir_port(options); + voter->or_port = router_get_advertised_or_port(options); voter->contact = tor_strdup(contact); if (options->V3AuthUseLegacyKey) { authority_cert_t *c = get_my_v3_legacy_cert(); @@ -2829,7 +2829,8 @@ generate_v2_networkstatus_opinion(void) "dir-options%s%s%s%s\n" "%s" /* client version line, server version line. */ "dir-signing-key\n%s", - hostname, fmt_addr32(addr), (int)options->DirPort, + hostname, fmt_addr32(addr), + (int)router_get_advertised_dir_port(options), fingerprint, contact, published, |