diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-10-19 14:35:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-10-19 14:35:29 -0400 |
| commit | 43836f6f0ab7c25b0c8c9fab366ec664ebd0b0ee (patch) | |
| tree | d47c734edfd322945a2ab61179aab3b996e5d383 /src/or/router.c | |
| parent | e318ab14b10f353da1ebcece0d6490191517e21a (diff) | |
| parent | c1c83eb376a7c89fadb01d1c7082d4aa4125333d (diff) | |
| download | tor-release-0.2.3.tar.gz tor-release-0.2.3.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3' into release-0.2.3release-0.2.3
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/router.c b/src/or/router.c index 1ace8e2492..a3459aec71 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -177,7 +177,7 @@ get_server_identity_key(void) int server_identity_key_is_set(void) { - return server_identitykey != NULL; + return server_mode(get_options()) && server_identitykey != NULL; } /** Set the current client identity key to <b>k</b>. |