Commit Graph

37951 Commits

Author SHA1 Message Date
skaluzka
ad7a50a6c8
Improve formatting of scripts/ci/ci-driver.sh
Add and remove few empty lines, covert all tabs to 4 spaces.
No real code changes here.

Signed-off-by: skaluzka <skaluzka@protonmail.com>
2022-01-06 21:25:30 +01:00
skaluzka
d129cfdc14
Add missing "Tor Project, Inc." to man files
Signed-off-by: skaluzka <skaluzka@protonmail.com>
2022-01-06 21:02:52 +01:00
Alexander Færøy
66e7ddb551 Merge remote-tracking branch 'tor-gitlab/mr/503' into main 2021-12-17 16:53:47 +00:00
David Goulet
c6486da83d configure: Remove typo created by CI patch
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-12-16 13:03:51 -05:00
David Goulet
0fe3eae3ee Merge branch 'maint-0.4.6' 2021-12-16 13:03:43 -05:00
David Goulet
413e0c7575 configure: Remove typo created by CI patch
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-12-16 13:03:23 -05:00
Nick Mathewson
5591a3bcd6 Merge remote-tracking branch 'tor-gitlab/mr/504' 2021-12-16 12:36:35 -05:00
David Goulet
ecffdb0b17 Merge branch 'maint-0.4.6' 2021-12-16 12:22:44 -05:00
David Goulet
51c7a08485 doc: One more poings in ReleasingTor.md
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-12-16 12:22:15 -05:00
David Goulet
3b10e0a393 changelog: Forward port ChangeLogs and ReleaseNotes
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-12-16 12:16:18 -05:00
David Goulet
a81ddc83be doc: Update ReleasingTor.md with missing steps
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-12-16 12:14:52 -05:00
Tor CI Release
00d7337002 version: Bump version to 0.4.6.9-dev 2021-12-16 12:00:07 -05:00
Tor CI Release
475d669f62 version: Bump version to 0.4.7.3-alpha-dev 2021-12-16 11:59:20 -05:00
David Goulet
8a63deb84f changelog: Fix ReleaseNotes leftover from CI
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-12-16 11:59:20 -05:00
David Goulet
e152a0a7cc doc: Improve a bit the ReleasingTor.md
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-12-16 11:59:20 -05:00
David Goulet
a2971919ad Merge branch 'maint-0.4.6' 2021-12-16 09:53:27 -05:00
David Goulet
ea2ada6d14 configure: Fix typo in version
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-12-16 09:53:16 -05:00
David Goulet
b5d12e32f6 configure: Fix typo in version
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-12-16 09:53:00 -05:00
David Goulet
8ebb735b70 changelog: Add release summary
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-12-16 09:34:32 -05:00
Tor CI Release
adc0d49ef2 release: ChangeLog and ReleaseNotes for 0.4.7.3-alpha 2021-12-16 09:32:04 -05:00
David Goulet
7a8aa8e36d Merge branch 'maint-0.4.6' 2021-12-16 09:28:17 -05:00
Tor CI Release
9a4366b3e3 Update geoip files to match ipfire location db, 2021/12/15. 2021-12-16 09:27:46 -05:00
Tor CI Release
57e8a9b8cb fallbackdir: Update list generated on December 15, 2021 2021-12-16 09:27:39 -05:00
Tor CI Release
955aa02c0d version: Bump version to 0.4.7.3-alpha 2021-12-16 09:27:29 -05:00
David Goulet
21d189d90e Merge branch 'maint-0.4.6' 2021-12-16 09:27:03 -05:00
Tor CI Release
faad5ded78 version: Bump version to 0.4.6.9 2021-12-16 09:23:30 -05:00
Hans-Christoph Steiner
a86918d524 fix syntax errors listed by cppcheck 2021-12-16 10:21:18 +01:00
David Goulet
48e993be95 changes: Minor syntax editing fixes
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-12-15 10:53:32 -05:00
David Goulet
bf10206e9e Fix compiler warnings from ubuntu/jammy
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-12-15 09:00:15 -05:00
Alexander Færøy
193781e6ef Merge remote-tracking branch 'tor-gitlab/mr/500' into main 2021-12-15 12:46:18 +00:00
Alexander Færøy
48d778bc32 Merge remote-tracking branch 'tor-gitlab/mr/491' into main 2021-12-15 12:41:00 +00:00
Alexander Færøy
95b82c4fee Merge remote-tracking branch 'tor-gitlab/mr/497' into main 2021-12-15 12:38:30 +00:00
skaluzka
39848ca166
Correct typo in scripts/README file
Signed-off-by: skaluzka <skaluzka@protonmail.com>
2021-12-14 23:14:02 +01:00
David Goulet
eb06d52dae fixup! relay: Change DNS timeout label on MetricsPort
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-12-14 16:13:00 -05:00
David Goulet
b37674fec7 fixup! relay: Change DNS timeout label on MetricsPort
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-12-14 16:12:17 -05:00
David Goulet
122c60c323 fixup! relay: Change DNS timeout label on MetricsPort 2021-12-14 12:14:39 -05:00
David Goulet
bf1ed5c853 relay: Change DNS timeout label on MetricsPort
Change it from "timeout" to "tor_timeout" in order to indicate that the
DNS timeout is one from tor's DNS threshold and not the DNS server
itself.

Fixes #40527

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-12-13 10:49:00 -05:00
David Goulet
ad6a0ebb11 Merge branch 'ticket40527_046_01' into ticket40527_047_01 2021-12-13 10:48:54 -05:00
David Goulet
cda7acb35d relay: Don't make DNS timeout trigger an overload
Tor has configure libevent to attempt up to 3 times a DNS query for a
maximum of 5 seconds each. Once that 5 seconds has elapsed, it consider
the query "Timed Out" but tor only gets a timeout if all 3 attempts have
failed.

For example, using Unbound, it has a much higher threshold of timeout.
It is well defined in
https://www.nlnetlabs.nl/documentation/unbound/info-timeout/ and has
some complexity to it. But the gist is that if it times out, it will be
much more than 5 seconds.

And so the Tor DNS timeouts are more of a "UX issue" rather than a
"network issue". For this reason, we are removing this metric from the
overload general signal.

See https://gitlab.torproject.org/tpo/network-health/team/-/issues/139
for more information.

Fixes #40527

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-12-13 10:47:46 -05:00
Nick Mathewson
b8e6eb6236 Merge remote-tracking branch 'tor-gitlab/mr/498' 2021-12-13 10:47:39 -05:00
Nick Mathewson
86819229af Limit the number of elements in a consdiff hash line.
This avoids performing and then freeing a lot of small mallocs() if
the hash line has too many elements.

Fixes one case of bug 40472; resolves OSS-Fuzz 38363.  Bugfix on
0.3.1.1-alpha when the consdiff parsing code was introduced.
2021-12-06 12:35:08 -05:00
Nick Mathewson
b4c55f3a70 changes: Describe when bug 7362 began. 2021-11-23 11:28:30 -05:00
Cecylia Bocovich
0d3894dbbc
Add documentation on {C,S}METHOD parsing behaviour 2021-11-23 11:18:04 -05:00
Cecylia Bocovich
809b636b6e
Don't kill managed proxy on method error
Some PT applications support more than one transport. For example,
obfs4proxy supports obfs4, obfs3, and meek. If one or more transports
specified in the torrc file are supported, we shouldn't kill the managed
proxy on a {C,S}METHOD-ERROR. Instead, we should log a warning.

We were already logging warnings on method errors. This change just
makes sure that the managed proxy isn't killed, and then if no
transports are configured for the managed proxy, bumps the log level up
from a notice to a warning.

Closes #7362
2021-11-19 14:50:36 -05:00
Nick Mathewson
dd085d42f9 Do not count controller-selected paths towards path bias.
As a side effect, this fixes a "Bug" warning.

Closes #40515.  Bugfix on 0.2.4.10-alpha.
2021-11-15 08:55:47 -05:00
Alexander Færøy
a78dafbf7c Merge branch 'maint-0.4.5' into maint-0.4.6 2021-11-08 14:16:19 +00:00
Alexander Færøy
9d8b0c5bdc Merge branch 'maint-0.4.6' into main 2021-11-08 14:16:19 +00:00
Alexander Færøy
882fd1f0d4 Merge branch 'maint-0.3.5' into maint-0.4.5 2021-11-08 14:16:18 +00:00
Alexander Færøy
4a24673436 Merge remote-tracking branch 'tor-gitlab/mr/487' into maint-0.3.5 2021-11-08 14:15:59 +00:00
Alexander Færøy
4914e0e1cc Merge remote-tracking branch 'tor-gitlab/mr/486' into maint-0.3.5 2021-11-08 14:15:56 +00:00