diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-17 11:09:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-17 11:09:54 -0400 |
| commit | d6a2fec05ebcc39773a2f6666e1378410c64f047 (patch) | |
| tree | c962faa2f33eede043d67419e0cfbba80a3b8653 /src/or/config.c | |
| parent | ff5eb7fc625374c29944b9ab7160b86559ce90a4 (diff) | |
| parent | 548d14247e3c8a48e2efb2ca62ee7a05fca843ba (diff) | |
| download | tor-d6a2fec05ebcc39773a2f6666e1378410c64f047.tar.gz tor-d6a2fec05ebcc39773a2f6666e1378410c64f047.zip | |
Merge branch 'bug18616-v4-merged_028' into maint-0.2.8
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index 5d938d101a..0850013d33 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4343,8 +4343,10 @@ options_transition_affects_descriptor(const or_options_t *old_options, !opt_streq(old_options->MyFamily, new_options->MyFamily) || !opt_streq(old_options->AccountingStart, new_options->AccountingStart) || old_options->AccountingMax != new_options->AccountingMax || + old_options->AccountingRule != new_options->AccountingRule || public_server_mode(old_options) != public_server_mode(new_options) || - old_options->DirCache != new_options->DirCache) + old_options->DirCache != new_options->DirCache || + old_options->AssumeReachable != new_options->AssumeReachable) return 1; return 0; @@ -7005,9 +7007,8 @@ get_first_listener_addrport_string(int listener_type) int get_first_advertised_port_by_type_af(int listener_type, int address_family) { - if (!configured_ports) - return 0; - SMARTLIST_FOREACH_BEGIN(configured_ports, const port_cfg_t *, cfg) { + const smartlist_t *conf_ports = get_configured_ports(); + SMARTLIST_FOREACH_BEGIN(conf_ports, const port_cfg_t *, cfg) { if (cfg->type == listener_type && !cfg->server_cfg.no_advertise && (tor_addr_family(&cfg->addr) == address_family || |