mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse source
This commit is contained in:
Nick Mathewson 2013-10-08 12:17:14 -04:00
commit 1060688d2a
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changes/bug6979 Normal file
View file

@ -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.

2
src/or/router.c
View file

@ -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>.