e7dddda9c1
Merge branch 'maint-0.4.6' into release-0.4.6
2022-08-12 10:55:10 -04:00
83965eca26
version: Bump version to 0.4.6.12-dev
2022-08-12 10:54:41 -04:00
0915eb6862
Merge branch 'maint-0.4.5' into maint-0.4.6
2022-08-12 10:54:31 -04:00
d52a5f2181
version: Bump version to 0.4.5.14-dev
2022-08-12 10:54:19 -04:00
726441421c
Merge branch 'maint-0.4.6' into release-0.4.6
2022-08-12 10:17:16 -04:00
111b2d3a9f
version: Bump version to 0.4.6.12
2022-08-12 10:17:03 -04:00
f76d516982
release: ChangeLog and ReleaseNotes for 0.4.6.12
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2022-08-12 10:16:38 -04:00
368995a2c5
Merge branch 'maint-0.4.6' into release-0.4.6
2022-08-12 10:14:38 -04:00
b86b593c04
Merge branch 'maint-0.4.5' into maint-0.4.6
2022-08-12 10:14:32 -04:00
ecb194b9da
version: Bump version to 0.4.5.14
2022-08-12 10:12:06 -04:00
0aadc8c684
Merge branch 'maint-0.4.6' into release-0.4.6
2022-08-12 09:56:54 -04:00
8244eefcd3
Merge branch 'maint-0.4.5' into maint-0.4.6
2022-08-12 09:56:54 -04:00
bb88086c72
geoip: Update geoip files with August 9th, 2022 database
...
Fixes #40658
Signed-off-by: David Goulet <dgoulet@torproject.org >
2022-08-12 09:56:50 -04:00
80486c8877
version: Bump version to 0.4.6.11-dev
2022-08-11 12:23:40 -04:00
3dbff14d94
Revert "version: Bump version to 0.4.6.11-dev"
...
This reverts commit 8e868600dd
2022-08-11 12:22:07 -04:00
234ea8150e
Merge branch 'maint-0.4.6' into release-0.4.6
2022-08-11 11:15:20 -04:00
8e868600dd
version: Bump version to 0.4.6.11-dev
2022-08-11 11:14:44 -04:00
3c5ae66c1f
Merge branch 'maint-0.4.5' into maint-0.4.6
2022-08-11 11:14:34 -04:00
3b143927b3
version: Bump version to 0.4.5.13-dev
2022-08-11 11:14:20 -04:00
a3ddd702f6
Merge branch 'maint-0.4.6' into release-0.4.6
2022-08-11 10:23:44 -04:00
9da84f71a9
release: ChangeLog/ReleaseNotes fixes
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2022-08-11 10:23:32 -04:00
91f9f7ce8d
release: ChangeLog and ReleaseNotes for 0.4.6.11
2022-08-11 10:19:26 -04:00
661c214f4b
version: Bump version to 0.4.6.11
2022-08-11 10:19:11 -04:00
54d6aadaa6
Merge branch 'maint-0.4.6' into release-0.4.6
2022-08-11 10:17:35 -04:00
3684e512ff
Merge branch 'maint-0.4.5' into maint-0.4.6
2022-08-11 10:17:30 -04:00
56152a1048
version: Bump version to 0.4.5.13
2022-08-11 09:50:20 -04:00
fb84f070eb
Merge branch 'maint-0.4.6' into release-0.4.6
2022-08-11 09:44:47 -04:00
c65d8b2aad
Merge branch 'maint-0.4.5' into maint-0.4.6
2022-08-11 09:44:47 -04:00
65ffb97c2f
fallbackdir: Update list generated on August 11, 2022
2022-08-11 09:44:39 -04:00
f9acdd0630
Update geoip files to match ipfire location db, 2022/08/11.
2022-08-11 09:44:32 -04:00
3932788368
Merge branch 'maint-0.4.6' into release-0.4.6
2022-08-10 13:59:20 -04:00
9e8f76d430
Merge branch 'maint-0.4.5' into maint-0.4.6
2022-08-10 13:59:20 -04:00
362839a77d
fallbackdirs: Update list from maint-0.4.7
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2022-08-10 13:59:14 -04:00
156cde02c6
Merge branch 'maint-0.4.6' into release-0.4.6
2022-08-10 13:41:25 -04:00
e465f511a5
Merge branch 'maint-0.4.5' into maint-0.4.6
2022-08-10 13:41:25 -04:00
13d2d1246f
geoip: Update files from maint-0.4.7
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2022-08-10 13:41:22 -04:00
487c47d556
Merge branch 'maint-0.4.6' into release-0.4.6
2022-08-02 16:14:02 -04:00
5cc6ab0c1e
Merge branch 'maint-0.4.5' into maint-0.4.6
2022-08-02 16:14:02 -04:00
10d755ead5
Merge branch 'tor-gitlab/mr/608' into maint-0.4.5
2022-08-02 16:13:58 -04:00
0f9842a0d2
Merge branch 'maint-0.4.6' into release-0.4.6
2022-08-02 16:08:50 -04:00
e69cf2340b
Merge branch 'maint-0.4.5' into maint-0.4.6
2022-08-02 16:08:50 -04:00
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
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
ee20d74672
Merge branch 'maint-0.4.6' into release-0.4.6
2022-07-27 11:33:19 -04:00
e618a7e445
Merge branch 'maint-0.4.5' into maint-0.4.6
2022-07-27 11:33:19 -04:00
691e542fd5
Merge branch 'tor-gitlab/mr/605' into maint-0.4.5
2022-07-27 11:33:16 -04:00
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
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
2dee45267b
Merge branch 'maint-0.4.6' into release-0.4.6
2022-07-26 16:16:04 -04:00
5260b4ef34
Merge branch 'maint-0.4.5' into maint-0.4.6
2022-07-26 16:16:04 -04:00
David Goulet
Tor CI Release
Nick Mathewson