summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-10-26 11:08:19 -0400
committerNick Mathewson <nickm@torproject.org>2011-10-26 11:08:19 -0400
commitbeb9097beda7cc82eec744878a2efd2810351158 (patch)
treebf3638694718edda8b060f5dad3c35dce9f7da33 /src/or/main.c
parent34f12437d42bf8cf04763e851b54d6a96470e288 (diff)
parent4a1a89be0cd1abbd2aa4746038f52cd0dcffa65a (diff)
downloadtor-beb9097beda7cc82eec744878a2efd2810351158.tar.gz
tor-beb9097beda7cc82eec744878a2efd2810351158.zip
Merge remote-tracking branch 'origin/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 d01552fc16..c1a7015e68 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1689,7 +1689,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) {