aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-14Merge branch 'maint-0.4.4' into release-0.4.4release-0.4.4Nick Mathewson
2021-06-14Merge branch 'maint-0.3.5' into maint-0.4.4maint-0.4.4Nick Mathewson
"ours" to avoid version bump.
2021-06-14Bump to 0.3.5.15-devNick Mathewson
2021-06-14Copy ChangeLog into ReleaseNotes.tor-0.4.4.9Nick Mathewson
2021-06-10Pick a date, draft a blurbNick Mathewson
2021-06-10Backport changelog entriesNick Mathewson
2021-06-10Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-06-10Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
2021-06-10Fix TROVE-2021-006: Out-of-bounds read on v3 desc parsingGeorge Kadianakis
2021-06-10Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-06-10Resolve remaining merge conflicts in relay.cNick Mathewson
(My bad!)
2021-06-10Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-06-10Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
Conflicts resolved: src/core/or/relay.c
2021-06-10TROVE-2021-003: Check layer_hint before half-closed end and resolve cellsDavid Goulet
This issue was reported by Jann Horn part of Google's Project Zero. Jann's one-sentence summary: entry/middle relays can spoof RELAY_END cells on half-closed streams, which can lead to stream confusion between OP and exit. Fixes #40389
2021-06-10Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-06-10Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
2021-06-10Merge branch 'bug40391_035' into maint-0.3.5Nick Mathewson
2021-06-10Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-06-10Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
2021-06-10Merge branch 'bug40390_035_squashed' into maint-0.3.5Nick Mathewson
2021-06-10Assert on _all_ failures from RAND_bytes().Nick Mathewson
Previously, we would detect errors from a missing RNG implementation, but not failures from the RNG code itself. Fortunately, it appears those failures do not happen in practice when Tor is using OpenSSL's default RNG implementation. Fixes bug 40390; bugfix on 0.2.8.1-alpha. This issue is also tracked as TROVE-2021-004. Reported by Jann Horn at Google's Project Zero.
2021-06-10Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-06-10Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
2021-06-10Update geoip files to match ipfire location db, 2021/06/10.Nick Mathewson
2021-06-07remove rolled-up changes files.Nick Mathewson
2021-06-07Start on a changelog for 0.4.4.9Nick Mathewson
2021-06-07Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-06-07Bump to 0.4.4.9Nick Mathewson
2021-06-07Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
2021-06-07Bump to 0.3.5.15.Nick Mathewson
2021-05-25Merge branch 'maint-0.4.4' into release-0.4.4Alexander Færøy
2021-05-25Merge branch 'maint-0.3.5' into maint-0.4.4Alexander Færøy
2021-05-25Remove the function `tor_tls_assert_renegotiation_unblocked`.Nick Mathewson
It was used nowhere outside its own unit tests, and it was causing compilation issues with recent OpenSSL 3.0.0 alphas. Closes ticket 40399.
2021-05-18Use a more secure hash function for the circuitmux hashtable.Nick Mathewson
Fixes bug 40931; bugfix on 0.2.4.4-alpha. Also tracked as TROVE-2021-005. This issue was reported by Jann Horn from Google's Project Zero.
2021-05-07Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-05-07Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
2021-05-07Reindent a few lines to fix a GCC warning.Nick Mathewson
As of GCC 11.1.1, the compiler warns us about code like this: if (a) b; c; and that's a good thing: we wouldn't want to "goto fail". But we had an instance if this in circuituse.c, which was making our compilation sad. Fixes bug 40380; bugfix on 0.3.0.1-alpha.
2021-05-07Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-05-07Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
2021-05-07Update geoip files to match ipfire location db, 2021/05/07.Nick Mathewson
2021-04-21Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-04-21Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
2021-04-21Merge remote-tracking branch 'tor-gitlab/mr/363' into maint-0.3.5George Kadianakis
2021-04-14Merge branch 'maint-0.4.4' into release-0.4.4David Goulet
2021-04-14Merge branch 'maint-0.3.5' into maint-0.4.4David Goulet
2021-04-14fallbackdir: Remove two unspec linesDavid Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-04-13Fix test naming, and fix tests on windows.Nick Mathewson
This is a bugfix against my fix for #40133, which has not yet appeared in 0.3.5.
2021-04-13Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-04-13Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
2021-04-13fallbackdir: Renegerate list with 200 relaysDavid Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion