diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-08 12:17:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-08 12:17:14 -0400 |
| commit | 1060688d2a351329ad6a4b751e312242b57531a0 (patch) | |
| tree | 37988bb5b30c742fcc47eebe1993620d1e9976cc | |
| parent | 5e0404265fd0e1f297b4b587419870fcd58a9d7c (diff) | |
| parent | 7e0f1fa52adcf67d7b9c5459a3cc74f57bbfa3e2 (diff) | |
| download | tor-1060688d2a351329ad6a4b751e312242b57531a0.tar.gz tor-1060688d2a351329ad6a4b751e312242b57531a0.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
| -rw-r--r-- | changes/bug6979 | 4 | ||||
| -rw-r--r-- | src/or/router.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug6979 b/changes/bug6979 new file mode 100644 index 0000000000..55572ecbac --- /dev/null +++ b/changes/bug6979 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix an assertion failure that would occur when disabling the + ORPort setting on a running Tor process while accounting was + enabled. Fixes bug 6979; bugfix on 0.2.2.18-alpha. diff --git a/src/or/router.c b/src/or/router.c index 1063eda044..edae2671f3 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -236,7 +236,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>. |