diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-15 11:44:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-15 11:44:51 -0400 |
| commit | 37e3fb8af20b02f764d0993218ed6025448073dd (patch) | |
| tree | 956927bb08f18e3f050cafdbc9c0c1f54a083d28 /src/or/main.c | |
| parent | 2fd9cfdc234f5ec0d6799511be9ad7a57c52b45e (diff) | |
| parent | f2871009346e0589455be14e9cef930c19082c0a (diff) | |
| download | tor-37e3fb8af20b02f764d0993218ed6025448073dd.tar.gz tor-37e3fb8af20b02f764d0993218ed6025448073dd.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/connection_edge.c
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c index d5ce6ee486..389ddbdf19 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1639,7 +1639,6 @@ do_hup(void) router_reset_warnings(); routerlist_reset_warnings(); - addressmap_clear_transient(); /* first, reload config variables, in case they've changed */ if (options->ReloadTorrcOnSIGHUP) { /* no need to provide argc/v, they've been cached in init_from_config */ |