nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,105 Commits 53 Branches 630 Tags 128 MiB
ac306581af
Commit Graph

38105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roger Dingledine
ac306581af fix a few more typos in comments 2022-08-06 21:04:28 -04:00
David Goulet
bf30943cb7 Merge branch 'maint-0.4.7' 2022-08-02 16:14:02 -04:00
David Goulet
eee35adf74 Merge branch 'maint-0.4.6' into maint-0.4.7 2022-08-02 16:14:02 -04:00
David Goulet
5cc6ab0c1e Merge branch 'maint-0.4.5' into maint-0.4.6 2022-08-02 16:14:02 -04:00
David Goulet
10d755ead5 Merge branch 'tor-gitlab/mr/608' into maint-0.4.5 2022-08-02 16:13:58 -04:00
David Goulet
4d3f42a6f2 Merge branch 'maint-0.4.7' 2022-08-02 16:08:50 -04:00
David Goulet
645eff49ac Merge branch 'maint-0.4.6' into maint-0.4.7 2022-08-02 16:08:50 -04:00
David Goulet
e69cf2340b Merge branch 'maint-0.4.5' into maint-0.4.6 2022-08-02 16:08:50 -04:00
David Goulet
6fcae8e0d0 relay: Don't send DESTROY remote reason backward or forward 
Fixes #40649

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-08-02 15:53:31 -04:00
David Goulet
f51c68729f Merge branch 'maint-0.4.7' 2022-08-02 15:31:00 -04:00
Mike Perry
af5ef98d1b Changes file for bug 40644. 2022-08-02 18:13:46 +00:00
Mike Perry
533fe36957 Add an underflow check to a cwnd error condition. 2022-08-02 18:13:42 +00:00
David Goulet
0c984e0ec2 conn: Notify btrack subsys on normal OR conn close 
Fixes #40604

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-08-01 10:58:40 -04:00
David Goulet
e618a7e445 Merge branch 'maint-0.4.5' into maint-0.4.6 2022-07-27 11:33:19 -04:00
David Goulet
22cb4c23d0 Merge branch 'maint-0.4.7' 2022-07-27 11:33:19 -04:00
David Goulet
7654e12be8 Merge branch 'maint-0.4.6' into maint-0.4.7 2022-07-27 11:33:19 -04:00
David Goulet
691e542fd5 Merge branch 'tor-gitlab/mr/605' into maint-0.4.5 2022-07-27 11:33:16 -04:00
Nick Mathewson
8e7bd96362 Fix a check, make a netflow padding function more safe. 
Previously, `channelpadding_get_netflow_inactive_timeout_ms` would
crash with an assertion failure if `low_timeout` was greater than
`high_timeout`. That wasn't possible in practice because of checks
in `channelpadding_update_padding_for_channel`, but it's better not
to have a function whose correctness is this tricky to prove.

Fixes #40645.  Bugfix on 0.3.1.1-alpha.
 2022-07-27 09:16:50 -04:00
David Goulet
dc13936f20 relay: Use remote reason when sending back a DESTROY 
Fix from previous commit where a DESTROY cell is sent instead of a
TRUNCATED.

Related to #40623

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-07-27 08:32:01 -04:00
David Goulet
ce1675ef65 Merge branch 'tor-gitlab/mr/601' 2022-07-26 16:18:04 -04:00
David Goulet
5260b4ef34 Merge branch 'maint-0.4.5' into maint-0.4.6 2022-07-26 16:16:04 -04:00
David Goulet
e98995bb08 Merge branch 'maint-0.4.6' into maint-0.4.7 2022-07-26 16:16:04 -04:00
David Goulet
028f5fd6ea Merge branch 'maint-0.4.7' 2022-07-26 16:16:04 -04:00
David Goulet
ed74c52158 cmux: Remove a log bug that is actually an acceptable race 
Closes #40647

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-07-26 16:14:09 -04:00
David Goulet
8d8afc4efa relay: Send DESTROY cell instead of TRUNCATED cell 
Note that with this commit, TRUNCATED cells won't be used anymore that
is client and relays won't emit them.

Fixes #40623

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-07-26 14:01:21 -04:00
David Goulet
b7f9a24c08 relay: Remove unused conn->ext_or_conn_id 
This also incidently removes a use of uninitialized stack data from the
connection_or_set_ext_or_identifier() function.

Fixes #40648

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-07-26 11:56:33 -04:00
Nick Mathewson
da52d7206a Merge remote-tracking branch 'tor-gitlab/mr/598' 2022-07-21 15:21:59 -04:00
Nick Mathewson
3cee70e87d Merge remote-tracking branch 'tor-gitlab/mr/592' 2022-07-21 15:19:28 -04:00
Nick Mathewson
0bd2065062 Merge remote-tracking branch 'tor-gitlab/mr/591' 2022-07-21 15:19:24 -04:00
Nick Mathewson
1ecd7c5d43 Merge remote-tracking branch 'tor-gitlab/mr/590' 2022-07-21 15:19:20 -04:00
Alex Xu (Hello71)
b1545b6d18 Changes file for #40630 (LibreSSL 3.5 compatibility) 2022-07-19 16:18:29 -04:00
Alex Xu (Hello71)
f3dabd705f LibreSSL 3.5 compatibility 
LibreSSL is now closer to OpenSSL 1.1 than OpenSSL 1.0. According to
https://undeadly.org/cgi?action=article;sid=20220116121253, this is the
intention of OpenBSD developers.

According to #40630, many special cases are needed to compile Tor against
LibreSSL 3.5 when using Tor's OpenSSL 1.0 compatibility mode, whereas only a
small number of #defines are required when using OpenSSL 1.1 compatibility
mode. One additional workaround is required for LibreSSL 3.4 compatibility.

Compiles and passes unit tests with LibreSSL 3.4.3 and 3.5.1.
 2022-07-07 14:01:32 -04:00
Roger Dingledine
834745929a fix easy typos 2022-07-05 15:18:29 -04:00
Roger Dingledine
f181ad7c59 fix typo in comment 2022-06-30 03:48:39 -04:00
Roger Dingledine
2b9d2055f0 typo fix in comment 2022-06-29 15:43:08 -04:00
David Goulet
331204e100 Revert "cmux: Don't pick a marked for close circuit as active" 
This reverts commit 4f1298e418.
 2022-06-23 10:55:56 -04:00
David Goulet
4f1298e418 cmux: Don't pick a marked for close circuit as active 
Fixes #25312

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-06-23 09:44:25 -04:00
Nick Mathewson
0dc9561f21 Add a missing "not" to a message. 
Closes #40619.

Bugfix on 0.2.5.4-alpha.
 2022-06-17 12:00:09 -04:00
David Goulet
d563d1a4b7 changelog: Merge 0.4.7.8 changelog 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-06-17 10:48:58 -04:00
David Goulet
9492dc3645 Merge branch 'maint-0.4.7' 2022-06-17 10:45:52 -04:00
Tor CI Release
e234df6098 version: Bump version to 0.4.7.8-dev 2022-06-17 10:45:24 -04:00
David Goulet
5ce8b82edc Merge branch 'maint-0.4.7' 2022-06-17 10:12:30 -04:00
Tor CI Release
7528524aee version: Bump version to 0.4.7.8 2022-06-17 10:10:27 -04:00
Tor CI Release
edde188cf2 release: ChangeLog and ReleaseNotes for 0.4.7.8 2022-06-17 10:10:16 -04:00
Tor CI Release
9cab60183d fallbackdir: Update list generated on June 17, 2022 2022-06-17 10:04:15 -04:00
Tor CI Release
223886c118 Update geoip files to match ipfire location db, 2022/06/17. 2022-06-17 10:04:06 -04:00
David Goulet
7fc474bd3f Merge branch 'maint-0.4.7' 2022-06-17 09:13:31 -04:00
Mike Perry
5a25374209 Add changes file for bug40626 2022-06-17 09:03:13 -04:00
Mike Perry
b0496d4019 Fix for RTT calculation hang during congestion control. 
Only cache RTT on explicit stalls; Only use this cache for the
RTT decrease case. Otherwise use only local circuit RTT state for clock jump
checks.
 2022-06-17 08:56:54 -04:00
Nick Mathewson
0eb21427c9 Don't add redundant quotes with escaped() in log messages. 
The escaped() function and its kin already wrap their output in
quotes: there's no reason to do so twice.

I am _NOT_ making a corresponding change in calls that make the same
mistake in controller-related functions, however, due to the risk of
a compatibility break. :(

Closes #22723.
 2022-06-16 14:35:38 -04:00