nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'origin/maint-0.2.1' into m3

Browse Source
This commit is contained in:
Nick Mathewson 2009-05-12 14:04:51 -04:00
commit a271c5370a
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/config.c
View File

@ -3013,6 +3013,18 @@ options_validate(or_options_t *old_options, or_options_t *options,
REJECT("TransPort and TransListenAddress are disabled in this build."); REJECT("TransPort and TransListenAddress are disabled in this build.");
#endif #endif
#ifndef MS_WINDOWS
if (options->AccountingMax &&
(options->DirPort < 1024 || options->ORPort < 1024))
log(LOG_WARN, LD_CONFIG,
"You have set AccountingMax to use hibernation. You have also "
"chosen a low DirPort or OrPort. This combination can make Tor stop "
"working when it tries to re-attach the port after a period of "
"hibernation. Please choose a different port or turn off "
"hibernation unless you know this combination will work on your "
"platform.");
#endif
if (options->ExcludeExitNodes || options->ExcludeNodes) { if (options->ExcludeExitNodes || options->ExcludeNodes) {
options->_ExcludeExitNodesUnion = routerset_new(); options->_ExcludeExitNodesUnion = routerset_new();
routerset_union(options->_ExcludeExitNodesUnion,options->ExcludeExitNodes); routerset_union(options->_ExcludeExitNodesUnion,options->ExcludeExitNodes);