diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-09 11:51:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-09 11:51:18 -0400 |
| commit | 59f3cce0dcddb98301d18d0cb4cb08c1619fa34c (patch) | |
| tree | 988f823cc734aaaaf08c8fb0b40f372b4c66f4ff /src/or/router.c | |
| parent | 4af88d68b4905beac168adb5f1756d610ff7ed7e (diff) | |
| parent | 607724c696a6e1bb10c8a955dac38f0ea947ce34 (diff) | |
| download | tor-59f3cce0dcddb98301d18d0cb4cb08c1619fa34c.tar.gz tor-59f3cce0dcddb98301d18d0cb4cb08c1619fa34c.zip | |
Merge branch 'bug12899_squashed'
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/router.c b/src/or/router.c index 4d1e74e731..7bcc02ef39 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -911,9 +911,8 @@ init_keys(void) const char *m = NULL; routerinfo_t *ri; /* We need to add our own fingerprint so it gets recognized. */ - if (dirserv_add_own_fingerprint(options->Nickname, - get_server_identity_key())) { - log_err(LD_GENERAL,"Error adding own fingerprint to approved set"); + if (dirserv_add_own_fingerprint(get_server_identity_key())) { + log_err(LD_GENERAL,"Error adding own fingerprint to set of relays"); return -1; } if (mydesc) { |