aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-08-14 08:40:51 -0400
committerNick Mathewson <nickm@torproject.org>2015-08-14 08:40:51 -0400
commit34aefe6f38716ad88f07aa479f09008ed9d179b2 (patch)
treee1b359ef751d5c1cf5e559e12d570f0c29b60749 /src/or/main.c
parent810ef71fd5efd09e915bdfe7c4c46f2409970862 (diff)
parent835e09e54b07cac826e1d2efb450b0223e8a92ba (diff)
downloadtor-34aefe6f38716ad88f07aa479f09008ed9d179b2.tar.gz
tor-34aefe6f38716ad88f07aa479f09008ed9d179b2.zip
Merge remote-tracking branch 'public/decouple_init_keys'
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index a29387c67a..092014f7fa 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1912,7 +1912,7 @@ ip_address_changed(int at_interface)
if (at_interface) {
if (! server) {
/* Okay, change our keys. */
- if (init_keys()<0)
+ if (init_keys_client() < 0)
log_warn(LD_GENERAL, "Unable to rotate keys after IP change!");
}
} else {