Taylor Yu
4c38fccb9b
Move command-line conf option description earlier
...
In tor.1.txt, move the paragraphs at the end of the COMMAND-LINE
OPTIONS section earlier. This text describes how the user can specify
configuration options on the command line.
Also clarify some wording and formatting.
Based on a patch by Swati Thacker. Part of ticket 32277.
2019-10-29 16:39:03 -05:00
Nick Mathewson
9a66b33229
A little more text in the SEE ALSO section.
2019-10-24 11:45:07 -04:00
Nick Mathewson
fefee871a6
Merge remote-tracking branch 'tor-github/pr/1437'
2019-10-24 11:44:19 -04:00
teor
9db1602ec5
Merge branch 'maint-0.4.2'
2019-10-23 08:47:30 +10:00
Philipp Winter
80a198928e
Remove outdated note.
...
BridgeDB supports bridge-distribution lines since version 0.5.0:
<https://bugs.torproject.org/23957 >
2019-10-23 07:52:05 +10:00
Roger Dingledine
4233fb7014
clarify in man page: we count by powers of two
...
Make clear in the man page, in both the bandwidth section and the
accountingmax section, that Tor counts in powers of two, not
powers of ten: 1 GByte is 1024*1024*1024 bytes, not one billion
bytes.
Resolves ticket 32106.
2019-10-23 07:50:20 +10:00
Taylor Yu
6f8fad54fd
Reword back matter of tor.1.txt
...
Reword the SEE ALSO and BUGS sections of tor.1.txt. Based on a patch
by Swati Thacker. Part of #32176 .
2019-10-21 16:20:12 -05:00
Taylor Yu
8b9b51a6cb
Reformat some file names in tor.1.txt
...
Reformat file name headings in the FILES section of tor.1.txt to
display as fixed-width in the HTML version.
Based on a patch by Swati Thacker. Part of #32176 .
2019-10-21 16:20:12 -05:00
Taylor Yu
e8fe6bd8d6
Reword FILES section of tor.1.txt
...
Reword the FILES section of tor.1.txt. Based on a patch by Swati
Thacker.
Part of #32176 .
2019-10-21 16:20:12 -05:00
Taylor Yu
a4e83cd5e5
Remove redundant FILES entry in tor.1.txt
...
There was a redundant entry for approved-routers in the FILES section
of tor.1.txt.
Part of #32176 .
2019-10-21 16:20:12 -05:00
Suphanat Chunhapanya
1b07a2d7bf
doc: Add TCPProxy option
...
TCPProxy is used for proxying all outgoing OR connections through some
proxy with the protocol specified in the option.
2019-10-17 15:33:16 +08:00
Roger Dingledine
71daad1692
never say XB, always XBytes
...
fix three more instances in the man page that we forgot to fix
in earlier attempts
2019-10-16 03:31:23 -04:00
David Goulet
1f60337da4
Merge branch 'tor-github/pr/1381'
2019-10-08 14:49:39 -04:00
George Kadianakis
723288a32f
Improve v3 client auth documentation in the man page.
2019-10-01 13:39:34 +03:00
Nick Mathewson
6581f3e2fa
Fix the documentation for GuardLifetime.
2019-09-30 14:54:52 -04:00
teor
102546f99f
doc: Document the signal-safe log behaviour in the tor man page
...
Part of 31389.
2019-09-24 15:03:17 +10:00
David Goulet
e5cf1423fd
man: Entry for the HS intro DoS defenses
...
This also adds a "subsection" to the HIDDEN SERVICE OPTIONS section to
seperate per-service and per-instance options. It is a bit less messy this
way.
The HS DoS options are added to the per-service section.
Part of #30924
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-26 15:53:46 +03:00
teor
e87e34099c
Fix typos in HiddenServiceExportCircuitID
...
Closes bug 31418.
2019-08-15 18:58:10 +10:00
teor
f65f4b5c38
Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.3.5
2019-08-12 09:49:53 +10:00
teor
a57e168caa
Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5
2019-08-12 09:36:14 +10:00
George Kadianakis
15e28af2d1
Merge remote-tracking branch 'dgoulet/ticket31008_035_01'
2019-07-02 13:19:40 +03:00
David Goulet
f446db59e1
man: Fix -help typo to --help
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-27 14:52:12 -04:00
David Goulet
c34a6b922f
Merge branch 'tor-github/pr/1129'
2019-06-27 10:19:45 -04:00
teor
362afa8c4e
doc: update the man page entries for DirAuthority and FallbackDir
...
Improve the documentation for the DirAuthority and FallbackDir torrc
options.
Closes ticket 30955.
2019-06-27 10:19:40 -04:00
teor
872b85e689
Merge branch 'bug30956_041' into bug30956_master
2019-06-24 19:47:34 +10:00
teor
8356cc5b51
stats: Always publish pluggable transports in extra info documents
...
Always publish bridge pluggable transport information in the extra info
descriptor, even if ExtraInfoStatistics is 0. This information is
needed by BridgeDB.
Fixes bug 30956; bugfix on 0.4.1.1-alpha.
2019-06-24 19:44:24 +10:00
Iain R. Learmonth
58cb98af32
Prop 301: No longer vote on RecommendedPackages
...
This is the first half of implementing proposal 301. The
RecommendedPackages torrc option is marked as obsolete and
the test cases for the option removed. Additionally, the code relating
to generating and formatting package lines in votes is removed.
These lines may still appear in votes from other directory authorities
running earlier versions of the code and so consensuses may still
contain package lines. A new consensus method will be needed to stop
including package lines in consensuses.
Fixes : #28465
2019-05-16 13:31:54 +01:00
Nick Mathewson
1c95bdb83b
Merge branch 'ticket30452_035_v3' into ticket30452_041_v3
2019-05-14 19:20:53 -04:00
Nick Mathewson
1b16fcb70c
Add a --list-modules command
...
Closes ticket 30452.
2019-05-14 19:19:53 -04:00
Nick Mathewson
9ad2eb8f73
Merge branch 'bug28683_30173_29203_squashed'
2019-05-13 14:33:31 -04:00
Mike Perry
621ea2315b
Bug 29203: Provide ReducedCircuitPadding torrc and consensus params
2019-05-13 14:30:35 -04:00
Mike Perry
f4064d6ce2
Bug 28693: Provide Torrc option to disable circuit padding.
2019-05-13 14:30:35 -04:00
Nick Mathewson
c8c64caf37
Merge remote-tracking branch 'tor-github/pr/923'
2019-05-06 17:16:37 -04:00
teor
231036a110
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-19 12:00:41 +10:00
teor
b1762f8d12
Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4
2019-04-19 11:44:38 +10:00
Neel Chauhan
caa55a6d37
Grammar fixes for IPv6Exit in tor.1.txt
2019-04-17 21:41:31 -04:00
Neel Chauhan
cfada969a9
Update tor.1 man page for IPv6Exit
2019-04-17 07:26:55 -04:00
Nick Mathewson
f8dc935fb7
Merge remote-tracking branch 'tor-github/pr/741'
2019-04-11 14:27:06 -04:00
teor
8cfab3b7c3
doc: Improve the documentation for MapAddress .exit
...
Fixes bug 30109; bugfix on 0.1.0.1-rc.
2019-04-10 17:43:59 +10:00
teor
3d45079c27
Merge branch 'maint-0.4.0'
2019-04-09 11:36:59 +10:00
rl1987
61e6b217c5
manpage: Clarify that Tor does stream isolation between *Port listeners by default
...
cherry-pick of tor-github/pr/841 to maint-0.4.0.
2019-04-09 11:34:51 +10:00
George Kadianakis
574c207670
Merge branch 'maint-0.4.0'
2019-04-05 14:51:33 +03:00
Nick Mathewson
d194f6bedf
Implement an DormantCanceledByStartup option
...
Closes ticket 29357, and comes with appropriate notions of caution.
2019-04-04 11:48:36 -04:00
Nick Mathewson
a47b61f329
Merge branch 'messaging_v3' into messaging_v3_merged
2019-03-26 20:13:49 -04:00
George Kadianakis
d11976b8bd
Merge branch 'tor-github/pr/709'
2019-03-26 15:34:54 +02:00
Nick Mathewson
0944500a8e
Add MESG as a new log domain.
2019-03-25 16:35:33 -04:00
rl1987
27eec50527
manpage: fix formatting of example on quoting options with spaces
2019-03-03 11:51:08 +02:00
teor
9b7cdd23de
doc: update the man page and sample torrc for ExitRelay
...
We changed the default of ExitRelay in #21530 in 0.3.5.1-alpha, but
forgot to update the documentation.
Closes 29612.
2019-02-28 11:22:20 +10:00
David Goulet
a5dd41b9af
Merge branch 'tor-github/pr/638' into maint-0.4.0
2019-02-26 11:24:43 -05:00
teor
a798bd40fb
stats: Stop reporting statistics when ExtraInfoStatistics is 0
...
When ExtraInfoStatistics is 0, stop including bandwidth usage statistics,
GeoIPFile hashes, ServerTransportPlugin lines, and bridge statistics
by country in extra-info documents.
Fixes bug 29018; bugfix on 0.2.4.1-alpha (and earlier versions).
2019-02-19 19:01:44 +10:00
teor
361738c964
Merge branch 'bug29017-033' into bug29017-master-merge
2019-02-19 18:59:16 +10:00
rl1987
58cbe51708
Use RFC5737-compliant example IP addresses in manpage when describing MapAddress
2019-01-30 17:13:40 +02:00
Nick Mathewson
0ce4d23af5
Merge branch 'maint-0.3.5'
2019-01-22 08:04:55 -05:00
Nick Mathewson
7c6a8c674b
Fix documentation for ClientAuth on HSv3.
...
The manpage erroneously said "privkey" when "public-key" would have
been correct. Reported by "Felixix" as ticket 28979. Bugfix on
0.3.5.1-alpha.
2019-01-16 16:10:20 -05:00
Nick Mathewson
b169c8c14f
Merge remote-tracking branch 'asn-github/adaptive_padding-final'
2019-01-14 14:48:00 -05:00
George Kadianakis
2b29bccb85
Misc trivial improvements around circpadding code.
2019-01-10 13:06:08 +02:00
teor
85c598cbc2
stats: Make PaddingStatistics depend on ExtraInfoStatistics
...
When ExtraInfoStatistics is 0, stop including PaddingStatistics in
relay and bridge extra-info documents.
Fixes bug 29017; bugfix on 0.3.1.1-alpha.
2019-01-08 18:21:10 +10:00
Mike Perry
8ad497bb57
Config option to specify specific MiddleNodes.
...
Hope is this will make it easier to test on the live tor network.
Does not need to be merged if we don't want to, but will come in handy
for researchers.
Co-authored-by: George Kadianakis <desnacked@riseup.net>
2019-01-02 15:25:55 +02:00
rl1987
8eadfad71d
Tweak ControlPort description in manpage
2018-12-23 19:58:25 +02:00
Taylor Yu
b0f974633a
Add LD_BTRACK log domain for bootstrap tracker
...
Part of ticket 27167.
2018-12-20 18:46:17 -06:00
Nick Mathewson
0e6e902cbc
Merge branch 'document_--version'
2018-12-20 11:50:48 -05:00
Nick Mathewson
4d9b55907c
Even more clarify on --version.
2018-12-20 11:50:40 -05:00
Nick Mathewson
508837b62b
Document the output of --version
...
Closes 28889
2018-12-17 17:54:01 -05:00
Nick Mathewson
e969d9c6b4
Merge branch 'ticket28179_squashed' into ticket28179_squashed_merged
2018-12-17 16:41:01 -05:00
Alexander Færøy
ad4cc89c5d
Add "PT" log domain.
...
See: https://bugs.torproject.org/28179
2018-12-17 16:39:28 -05:00
Nick Mathewson
69264f96f3
Merge branch 'dormant_persist_squashed'
2018-12-13 08:26:10 -05:00
David Goulet
53855d72b7
man: Add that "GETINFO address" won't work with "Sandbox 1"
...
Patch by "wagon".
Closes #28538
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-12-12 13:23:46 -05:00
Nick Mathewson
4002a84ffe
Merge remote-tracking branch 'tor-github/pr/561'
2018-12-05 08:29:41 -05:00
David Goulet
8506dcdeb7
Merge branch 'maint-0.3.5'
2018-12-04 12:55:02 -05:00
Nick Mathewson
4f55884315
Add an option to start tor in dormant mode for the first time.
2018-12-04 12:08:24 -05:00
David Goulet
0906dde9d5
man: Document HSv3 client authorization revocation
...
Removing a ".auth" file revokes a client access to the service but the
rendezvous circuit is not closed service side because the service simply
doesn't know which circuit is for which client.
This commit notes in the man page that to fully revoke a client access to the
service, the tor process should be restarted.
Closes #28275
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-12-04 18:49:19 +02:00
rl1987
894d207f84
manpage: Mention that adding new HS is unsupported if Sandbox is enabled
2018-12-03 15:23:01 +02:00
Nick Mathewson
8221b5d587
Merge remote-tracking branch 'tor-github/pr/559'
2018-12-02 19:38:40 -05:00
teor
90ce8d0a58
doc: remove cached-routers from the man page
...
cached-routers was removed from the code a long time ago
2018-12-03 10:22:49 +10:00
Nick Mathewson
2b2b97484a
Merge branch 'ticket27490a_squashed'
2018-12-01 20:32:18 -05:00
Neel Chauhan
822cb93cab
Add new option ClientAutoIPv6ORPort to switch between IPv4 and IPv6 OR ports
2018-12-01 14:55:57 -05:00
Alexander Færøy
2b41b857bd
Add LD_PROCESS as log domain.
...
See: https://bugs.torproject.org/28179
2018-11-27 19:31:08 +01:00
Nick Mathewson
7d8e0cc9ab
Merge branch 'dormant_v2_squashed'
2018-11-26 16:33:31 -05:00
Nick Mathewson
3743f79695
Add options to control dormant-client feature.
...
The DormantClientTimeout option controls how long Tor will wait before
going dormant. It also provides a way to disable the feature by setting
DormantClientTimeout to e.g. "50 years".
The DormantTimeoutDisabledByIdleStreams option controls whether open but
inactive streams count as "client activity". To implement it, I had to
make it so that reading or writing on a client stream *always* counts as
activity.
Closes ticket 28429.
2018-11-26 16:32:40 -05:00
David Goulet
2b9a907bdc
Merge branch 'maint-0.3.5'
2018-11-26 14:59:24 -05:00
Nick Mathewson
63312e0299
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-15 16:47:25 -05:00
David Goulet
f41bec1290
man: ClientOnionAuthDir can't be reloaded with Sandbox 1
...
By adding a file to the ClientOnionAuthDir and sending a HUP signal, tor would
load the new file and use it. However, that doesn't work with the Sandbox
since post initilization, nothing can be changed.
Document in the manpage that limitation within the Sandbox description.
Closes #28128
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-11-15 14:36:39 -05:00
Nick Mathewson
586c3a7c90
Merge branch 'maint-0.3.5'
2018-11-14 07:42:56 -05:00
teor
c793cf338b
doc: Remove an outdated sentence from KeepalivePeriod in the man page
2018-11-14 18:05:56 +10:00
David Goulet
1c5c3f353a
Merge branch 'maint-0.3.5'
2018-10-30 11:29:30 -04:00
Mike Tigas
d023de945a
tweak manpage bits about v3 onion svc client auth
...
make a couple things more explicit, like not needing to set "HiddenServiceAuthorizeClient" & etc
2018-10-30 11:25:24 -04:00
rl1987
98fd3b4104
Mention DNS fallback in manpage
2018-10-20 20:34:08 +03:00
Nick Mathewson
9767cf8cc0
Merge branch 'bug26913_033'
2018-09-24 11:17:09 -04:00
David Goulet
dbc32400d5
man: Fix format typo for HiddenServiceExportCircuitID
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-21 09:54:22 -04:00
Nick Mathewson
0e4c42a912
Merge remote-tracking branch 'ahf-github/asn/bugs4700_2'
2018-09-21 09:40:16 -04:00
Alexander Færøy
03ef4ec466
Document the haproxy option of HiddenServiceExportCircuitID.
...
See: https://bugs.torproject.org/4700
2018-09-21 15:06:45 +02:00
Alexander Færøy
8ecaf41003
Support 'none' in torrc for HiddenServiceExportCircuitID.
...
See: https://bugs.torproject.org/4700
2018-09-20 20:59:42 +02:00
Nick Mathewson
4fd761a418
Make CacheDirectoryGroupReadable an autobool.
...
Since the default cache directory is the same as the default data
directory, we don't want the default CacheDirectoryGroupReadable
value (0) to override an explicitly set "DataDirectoryGroupReadable
1".
To fix this, I'm making CacheDirectoryGroupReadable into an
autobool, and having the default (auto) value mean "Use the value of
DataDirectoryGroupReadable if the directories are the same, and 0
otherwise."
Fixes bug 26913; bugfix on 0.3.3.1-alpha when the CacheDirectory
option was introduced.
2018-09-17 11:44:59 -04:00
Alexander Færøy
9b511dc5d6
Change HiddenServiceExportCircuitID to take a string parameter: the protocol.
...
This patch changes HiddenServiceExportCircuitID so instead of being a
boolean it takes a string, which is the protocol. Currently only the
'haproxy' protocol is defined.
See: https://bugs.torproject.org/4700
2018-09-15 16:52:36 +03:00
George Kadianakis
e44e6a1857
Add man page entry.
2018-09-15 16:52:36 +03:00
David Goulet
e7ab20710c
hs-v3: Add changes file and man page for client authorization
...
Closes #27547
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-13 11:47:58 -04:00
Nick Mathewson
8815960c46
Merge remote-tracking branch 'tor-github/pr/294'
2018-09-06 09:47:32 -04:00
rl1987
5db6cf7cbd
In manpage, warn about combination of MyFamily and BridgeRelay being bad
2018-09-02 21:06:34 +03:00
Roger Dingledine
721763126e
fix man page issue noticed during #26367 review
...
and fix two other nearby issues while i'm there
2018-08-28 16:28:45 -04:00
Nick Mathewson
76843639e5
Merge remote-tracking branch 'teor/bug22747'
2018-08-28 16:12:01 -04:00