nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Mathewson 2012-07-16 11:22:41 -04:00
commit deaf30a8af
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug6387 Normal file
View File

@ -0,0 +1,3 @@
o Documentation:
- Clarify the documentation for the Alternate*Authority options.
Fixes bug 6387.

11
doc/tor.1.txt
View File

@ -319,11 +319,14 @@ GENERAL OPTIONS
**AlternateHSAuthority** [__nickname__] [**flags**] __address__:__port__ __fingerprint__ +
**AlternateBridgeAuthority** [__nickname__] [**flags**] __address__:__port__ __ fingerprint__::
As DirServer, but replaces less of the default directory authorities. Using
These options behave as DirServer, but they replace fewer of the
default directory authorities. Using
AlternateDirAuthority replaces the default Tor directory authorities, but
leaves the hidden service authorities and bridge authorities in place.
Similarly, Using AlternateHSAuthority replaces the default hidden service
authorities, but not the directory or bridge authorities.
leaves the default hidden service authorities and bridge authorities in
place. Similarly, AlternateHSAuthority replaces the default hidden
service authorities, but not the directory or bridge authorities; and
AlternateBridgeAuthority replaces the default bridge authority,
but leaves the directory and hidden service authorities alone.
**DisableAllSwap** **0**|**1**::
If set to 1, Tor will attempt to lock all current and future memory pages,