aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-13Update geoip files to match ipfire location db, 2021/04/13.Nick Mathewson
2021-03-24Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-03-23channel: Fix use after free in channel_do_open_actions()David Goulet
Fortunately, our tor_free() is setting the variable to NULL after so we were in a situation where NULL was always used instead of the transport name. This first appeared in 894ff2dc8422cb86312c512698acd76476224f87 and results in basically no bridge with a transport being able to use DoS defenses. Fixes #40345 Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-03-16Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-03-16Bump version to 0.4.4.8-devNick Mathewson
2021-03-16Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
"ours" to avoid version bump.
2021-03-16Bump to 0.3.5.14-devNick Mathewson
2021-03-16Copy 0.4.4.8 changelog to releasenotestor-0.4.4.8Nick Mathewson
2021-03-15changelog updates from armaNick Mathewson
2021-03-15Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-03-15Remove check-best-practices from check-local in 0.4.4Nick Mathewson
2021-03-15Changelog for 0.4.4.8.Nick Mathewson
2021-03-15Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
2021-03-15Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-03-15Merge branch 'bug40316_035_v2' into maint-0.3.5Nick Mathewson
2021-03-15Fix detection of point to insert signatures on a pending consensus.Nick Mathewson
We were looking for the first instance of "directory-signature " when instead the correct behavior is to look for the first instance of "directory-signature " at the start of a line. Unfortunately, this can be exploited as to crash authorities while they're voting. Fixes #40316; bugfix on 0.2.2.4-alpha. This is TROVE-2021-002, also tracked as CVE-2021-28090.
2021-03-15Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
2021-03-15Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-03-15Clarify new intended strategy with TROVE-2021-001Nick Mathewson
We're going to disable this feature in all versions for now.
2021-03-15Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
2021-03-15Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-03-15Merge branch 'bug40286_disable_min_035' into maint-0.3.5Nick Mathewson
2021-03-15Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-03-15Bump to 0.4.4.8Nick Mathewson
2021-03-15Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
"ours" to avoid version bump.
2021-03-15Bump to 0.3.5.14Nick Mathewson
2021-03-12Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-03-12Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
2021-03-12Remove maxmind license; add ipfire location database license (cc by-sa 4.0)Nick Mathewson
2021-03-12Use the right ticket number.Nick Mathewson
2021-03-12Merge branch 'maint-0.4.4' into release-0.4.4Nick Mathewson
2021-03-12Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
2021-03-12update geoip-2021-03-12 to mention provider transition.Nick Mathewson
2021-03-12Update geoip files to match ipfire location db, 2021/03/12.Nick Mathewson
2021-03-01Merge branch 'maint-0.4.4' into release-0.4.4David Goulet
2021-03-01Merge branch 'maint-0.3.5' into maint-0.4.4David Goulet
2021-02-23Remove mallinfo() from codebaseDavid Goulet
Now deprecated in libc >= 2.33 Closes #40309 Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-02-23Remove mallinfo() from codebaseDavid Goulet
Now deprecated in libc >= 2.33 Closes #40309 Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-02-19Disable the dump_desc() function.Nick Mathewson
It can be called with strings that should have been length-delimited, but which in fact are not. This can cause a CPU-DoS bug or, in a worse case, a crash. Since this function isn't essential, the best solution for older Tors is to just turn it off. Fixes bug 40286; bugfix on 0.2.2.1-alpha when dump_desc() was introduced.
2021-02-05Merge branch 'maint-0.4.4' into release-0.4.4Alexander Færøy
2021-02-05Delete changes/40241_v2 as it breaks CI.Alexander Færøy
Unreviewed build fix. Discussed the cnage on IRC with Nick.
2021-02-05Merge branch 'maint-0.4.4' into release-0.4.4Alexander Færøy
2021-02-05Fix CI build: practracker error in connection_edge.c, take two.Alexander Færøy
This was a bad copy and paste error from the previous commit which generated a duplicated entry error from practracker. Unreviewed build fix. See: tor#40275.
2021-02-05Merge branch 'maint-0.4.4' into release-0.4.4Alexander Færøy
2021-02-05Fix CI build: practracker error in connection_edge.c.Alexander Færøy
We solve this error by allowing the connection_exit_connect() function to be 130 lines long. Unreviewed build fix commit. See: tor#40275.
2021-02-05Fix Windows build.Alexander Færøy
While trying to resolve our CI issues, the Windows build broke with an unused function error: src/test/test_switch_id.c:37:1: error: ‘unprivileged_port_range_start’ defined but not used [-Werror=unused-function] We solve this by moving the `#if !defined(_WIN32)` test above the `unprivileged_port_range_start()` function defintion such that it is included in its body. This is an unreviewed commit. See: tor#40275
2021-02-05Merge branch 'maint-0.4.4' into release-0.4.4Alexander Færøy
2021-02-05Merge branch 'tor-gitlab/mr/292_squashed' into maint-0.4.4Alexander Færøy