diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-06-04 15:02:47 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-06-04 15:02:47 -0400 |
| commit | 2f67a6e8c95aadadfc55b6245668471f7def72e6 (patch) | |
| tree | c79c3a2e61aa2831751ce5050e4987159c1940bf /src | |
| parent | e48f8e5e87603812a6b1844a5fa27bbc44a3543e (diff) | |
| parent | f2ff8145820243a05803367d31c8b34e03048706 (diff) | |
| download | tor-2f67a6e8c95aadadfc55b6245668471f7def72e6.tar.gz tor-2f67a6e8c95aadadfc55b6245668471f7def72e6.zip | |
Merge remote-tracking branch 'origin/maint-0.2.6'
Diffstat (limited to 'src')
| -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 24d47ccd18..bd17629210 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1291,6 +1291,8 @@ connection_listener_new(const struct sockaddr *listensockaddr, conn->port = gotPort; tor_addr_copy(&conn->addr, &addr); + memcpy(&lis_conn->entry_cfg, &port_cfg->entry_cfg, sizeof(entry_port_cfg_t)); + if (port_cfg->entry_cfg.isolation_flags) { lis_conn->entry_cfg.isolation_flags = port_cfg->entry_cfg.isolation_flags; if (port_cfg->entry_cfg.session_group >= 0) { @@ -1306,8 +1308,6 @@ connection_listener_new(const struct sockaddr *listensockaddr, } } - memcpy(&lis_conn->entry_cfg, &port_cfg->entry_cfg, sizeof(entry_port_cfg_t)); - if (type != CONN_TYPE_AP_LISTENER) { lis_conn->entry_cfg.ipv4_traffic = 1; lis_conn->entry_cfg.ipv6_traffic = 1; |