Alexander Færøy
d1c781e67e
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-08-16 13:58:32 +00:00
Alexander Færøy
78712990ab
Merge branch 'maint-0.3.5' into maint-0.4.5
2021-08-16 13:58:32 +00:00
Alexander Færøy
b07cd2ee90
Use debian:buster instead of debian:stable for now.
2021-08-16 13:57:56 +00:00
Nick Mathewson
b2c4ac09d4
Merge branch 'maint-0.4.6'
2021-08-16 09:51:27 -04:00
Nick Mathewson
6a01c34bb8
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-08-16 09:51:27 -04:00
Nick Mathewson
b2d6fed3e9
Disable message checking for some 32-bit tests about timegm failure.
...
Since we merged 40383, we don't expect these to give the same
warning on every platform.
2021-08-16 09:48:08 -04:00
Nick Mathewson
55e329fdc1
Merge branch 'maint-0.4.6'
...
"ours" to avoid version bump.
2021-08-16 08:21:15 -04:00
Nick Mathewson
fd38609ae2
Make the version 0.4.6.7, not 0.4.6.7-dev.
2021-08-16 08:21:04 -04:00
Nick Mathewson
df6a92dcc3
Merge branch 'maint-0.4.5' into maint-0.4.6
...
"ours" to avoid version bump
2021-08-16 08:19:17 -04:00
Nick Mathewson
1ec4c7b34a
Make the version 0.4.5.10, not 0.4.5.10-dev.
2021-08-16 08:18:57 -04:00
Nick Mathewson
1667e122de
Merge branch 'maint-0.3.5' into maint-0.4.5
...
"ours" to avoid version bump
2021-08-16 08:18:09 -04:00
Nick Mathewson
2984fba97a
Make the version 0.3.6.16, not 0.3.6.16-dev.
2021-08-16 08:17:59 -04:00
skaluzka
719169dbe3
Update combine_libs script
...
Remove commented code from production.
Align indentations to 4 spaces.
2021-08-14 21:45:44 +02:00
David Goulet
6260db5733
Merge branch 'maint-0.4.6'
2021-08-13 09:46:48 -04:00
David Goulet
70e249123a
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-08-13 09:46:31 -04:00
David Goulet
ca249131b0
Merge branch 'maint-0.3.5' into maint-0.4.5
2021-08-13 09:44:53 -04:00
David Goulet
041a0a362f
Update version to 0.3.5.16
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-08-13 09:43:44 -04:00
David Goulet
685b3e4383
Update version to 0.4.5.10
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-08-13 09:42:52 -04:00
David Goulet
07c417b207
Update version to 0.4.6.7
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-08-13 09:42:26 -04:00
David Goulet
4252744788
Merge branch 'maint-0.4.6'
2021-08-12 12:13:26 -04:00
David Goulet
4c3c40e70c
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-08-12 12:13:26 -04:00
David Goulet
33abeeab94
Merge branch 'maint-0.3.5' into maint-0.4.5
2021-08-12 12:13:25 -04:00
Alexander Færøy
eca5b62213
Update GeoIP files to match IPFire location DB as per 2021/08/12.
2021-08-12 15:38:11 +00:00
Alexander Færøy
2160697d14
Merge branch 'maint-0.4.6' into main
2021-08-11 13:15:59 +00:00
Alexander Færøy
b8660e384f
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-08-11 13:15:59 +00:00
Alexander Færøy
81635ec577
Merge branch 'maint-0.3.5' into maint-0.4.5
2021-08-11 13:15:58 +00:00
Alexander Færøy
7e0971d868
Merge remote-tracking branch 'tor-gitlab/mr/417' into maint-0.3.5
2021-08-11 13:15:35 +00:00
Alexander Færøy
ac254d5334
Merge branch 'maint-0.4.6' into main
2021-08-11 13:14:26 +00:00
Alexander Færøy
e3c2179f25
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-08-11 13:14:26 +00:00
Alexander Færøy
c48d1c3f7c
Merge branch 'maint-0.3.5' into maint-0.4.5
2021-08-11 13:14:26 +00:00
George Kadianakis
fe5a9db1e6
Disable ed25519-donna's batch verification.
...
Fixes bug 40078.
As reported by hdevalence our batch verification logic can cause an assert
crash.
The assert happens because when the batch verification of ed25519-donna fails,
the code in `ed25519_checksig_batch()` falls back to doing a single
verification for each signature.
The crash occurs because batch verification failed, but then all signatures
individually verified just fine.
That's because batch verification and single verification use a different
equation which means that there are sigs that can pass single verification
but fail batch verification.
Fixing this would require modding ed25519-donna which is not in scope for
this ticket, and will be soon deprecated in favor of arti and
ed25519-dalek, so my branch instead removes batch verification.
2021-08-11 13:14:05 +00:00
Alexander Færøy
5ab108360d
Merge branch 'maint-0.4.6' into main
2021-08-11 13:07:46 +00:00
Alexander Færøy
a3a5e26212
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-08-11 13:07:46 +00:00
David Goulet
0e60b65f6c
fallbackdir: Regenerate list
...
New list for all stable releases.
Closes #40447
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-08-11 09:07:05 -04:00
Alexander Færøy
e7a8c3d127
Merge branch 'maint-0.3.5' into maint-0.4.5
2021-08-11 13:06:12 +00:00
David Goulet
399518da02
relay: Reduce streaming compression ratio from HIGH to LOW
...
Fixes #40301
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-08-11 12:51:32 +00:00
Alexander Færøy
61c88fbec9
Merge branch 'maint-0.4.6' into main
2021-08-11 12:48:04 +00:00
Alexander Færøy
3d0b4c7c45
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-08-11 12:48:04 +00:00
David Goulet
70d8fb3eab
relay: Reduce streaming compression ratio from HIGH to LOW
...
Fixes #40301
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-08-11 12:47:20 +00:00
Mike Perry
5c3021be85
Make inbuf and outbuf len check params const
2021-07-30 12:57:31 -04:00
Mike Perry
a0368b3759
MAKEFILE: include new CC algs in makefile
2021-07-30 12:57:31 -04:00
Mike Perry
ed1e91ffc2
TOR_NOLA: Implement a pure BDP tracking CC alg
...
How come no one ever named a congestion control algorithm after New Orleans?
2021-07-30 12:57:31 -04:00
Mike Perry
663cd052b5
TOR_VEGAS: Implement Prop#324 TOR_VEGAS.
2021-07-30 12:57:30 -04:00
Mike Perry
33cd92922a
TOR_WESTWOOD: Implement Prop#324 TOR_WESTWOOD
2021-07-30 12:57:30 -04:00
Mike Perry
66f975e4e6
Prop#324: Free congestion control object on circ and cpath
2021-07-30 12:57:30 -04:00
Mike Perry
4d8c6d5701
Prop#324: Hook up CC window checks for relay cell packaging
2021-07-30 12:57:30 -04:00
Mike Perry
31fc7591a1
Prop#324: Hook up CC algs to main sendme callpoints
2021-07-30 12:57:30 -04:00
Mike Perry
802d7e22c5
Prop#324: Add congestion control state to structs
2021-07-30 12:57:30 -04:00
Mike Perry
f1d0c2d826
Prop#324: Common RTT, BDP, and blocked channel signal support
2021-07-30 12:57:30 -04:00
George Kadianakis
4f68fe3e6c
Merge branch 'vanguards-lite-dev-rebased'
2021-07-28 12:00:37 +03:00