diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-08 12:16:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-08 12:16:42 -0400 |
| commit | 7e0f1fa52adcf67d7b9c5459a3cc74f57bbfa3e2 (patch) | |
| tree | c0b2a1e8d9cdbc68de41de462c92102327d10436 | |
| parent | 0c3c47565da970839b3701f60fd310ba059ed8af (diff) | |
| parent | dece40fd7729934bc32906e94d3e5e746c01f970 (diff) | |
| download | tor-7e0f1fa52adcf67d7b9c5459a3cc74f57bbfa3e2.tar.gz tor-7e0f1fa52adcf67d7b9c5459a3cc74f57bbfa3e2.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3' into 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 6069da8f09..6efd851588 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>. |