diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-16 23:13:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-16 23:13:27 -0400 |
| commit | 74ddd5f739696749409c933f82cf3a93152da6cc (patch) | |
| tree | 8d85a2c549485cb47abba78eefe5f35869552d01 /src/or/config.c | |
| parent | 10174b00e7258cc8184e85c37a2a39b04a0df92e (diff) | |
| parent | f36e93206a20b37321b372802032d3dec481856d (diff) | |
| download | tor-74ddd5f739696749409c933f82cf3a93152da6cc.tar.gz tor-74ddd5f739696749409c933f82cf3a93152da6cc.zip | |
Merge remote-tracking branch 'andrea/bug11306'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 23a63ccd24..b5827bee6b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1179,10 +1179,13 @@ options_act_reversible(const or_options_t *old_options, char **msg) SMARTLIST_FOREACH(replaced_listeners, connection_t *, conn, { + int marked = conn->marked_for_close; log_notice(LD_NET, "Closing old %s on %s:%d", conn_type_to_string(conn->type), conn->address, conn->port); connection_close_immediate(conn); - connection_mark_for_close(conn); + if (!marked) { + connection_mark_for_close(conn); + } }); goto done; |