Skip to content
Snippets Groups Projects
Commit a271c537 authored by Nick Mathewson's avatar Nick Mathewson :family:
Browse files

Merge commit 'origin/maint-0.2.1' into m3

parents 5fc08d19 a28215a1
No related branches found
No related tags found
No related merge requests found
......@@ -3013,6 +3013,18 @@ options_validate(or_options_t *old_options, or_options_t *options,
REJECT("TransPort and TransListenAddress are disabled in this build.");
#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) {
options->_ExcludeExitNodesUnion = routerset_new();
routerset_union(options->_ExcludeExitNodesUnion,options->ExcludeExitNodes);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment