Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Core
Tor
Commits
b370052a
Commit
b370052a
authored
9 years ago
by
Joan Queralt
Committed by
Nick Mathewson
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
+ and / usage clarification - Fixes #13158
parent
d20a3d07
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
doc/tor.1.txt
+7
-4
7 additions, 4 deletions
doc/tor.1.txt
with
7 additions
and
4 deletions
doc/tor.1.txt
+
7
−
4
View file @
b370052a
...
...
@@ -128,13 +128,16 @@ complicated for options that are allowed to occur more than once: if you
specify four SOCKSPorts in your configuration file, and one more SOCKSPort on
the command line, the option on the command line will replace __all__ of the
SOCKSPorts in the configuration file. If this isn't what you want, prefix
the option name with a plus sign, and it will be appended to the previous set
of options instead.
the option name with a plus sign (+), and it will be appended to the previous
set of options instead. For example, setting SOCKSPort 9100 will use only
port 9100, but setting +SOCKSPort 9100 will use ports 9100 and 9050 (because
this is the default).
Alternatively, you might want to remove every instance of an option in the
configuration file, and not replace it at all: you might want to say on the
command line that you want no SOCKSPorts at all. To do that, prefix the
option name with a forward slash.
option name with a forward slash (/). You can use the plus sign (+) and the
forward slash (/) in the configuration file and on the command line.
GENERAL OPTIONS
---------------
...
...
@@ -2557,7 +2560,7 @@ __DataDirectory__**/control_auth_cookie**::
overridden by the CookieAuthFile config option. Regenerated on startup. See
control-spec.txt in https://spec.torproject.org/[torspec] for details.
Only used when cookie authentication is enabled.
__DataDirectory__**/lock**::
This file is used to prevent two Tor instances from using same data
directory. If access to this file is locked, data directory is already
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment