aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-10-26 11:07:28 -0400
committerNick Mathewson <nickm@torproject.org>2011-10-26 11:07:28 -0400
commit4a1a89be0cd1abbd2aa4746038f52cd0dcffa65a (patch)
tree2aa6521f2a1221feeac093ad6805d1b99459f823 /src/or/main.c
parent9af3a3c419fdad85933cad800a995f19bda08d28 (diff)
parent246afc1b1ba8c81557307bfffa5291c91cc2c782 (diff)
downloadtor-4a1a89be0cd1abbd2aa4746038f52cd0dcffa65a.tar
tor-4a1a89be0cd1abbd2aa4746038f52cd0dcffa65a.tar.gz
Merge remote-tracking branch 'public/cov_run224_022' into maint-0.2.2
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 95acea4f5..b1159746a 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1378,7 +1378,8 @@ ip_address_changed(int at_interface)
if (at_interface) {
if (! server) {
/* Okay, change our keys. */
- init_keys();
+ if (init_keys()<0)
+ log_warn(LD_GENERAL, "Unable to rotate keys after IP change!");
}
} else {
if (server) {