summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-28Pick a release date.tor-0.4.6.4-rcNick Mathewson
2021-05-28Merge branch 'maint-0.4.6' into release-0.4.6Nick Mathewson
2021-05-28Bump to 0.4.6.4-rc.Nick Mathewson
2021-05-28Merge branch 'maint-0.4.6' into release-0.4.6Nick Mathewson
2021-05-28Merge branch 'maint-0.4.5' into maint-0.4.6Nick Mathewson
2021-05-28Stop using the "x$FOO" idiom in git-resquash.shNick Mathewson
The new version of shellcheck says that that this idiom is unnecessary, and its presence here is making the shellcheck tests fail. No changes file needed, since this is not user-facing code.
2021-05-28Create an 0.4.6.4-rc changelog.Nick Mathewson
2021-05-27Merge branch 'maint-0.4.6' into release-0.4.6David Goulet
2021-05-27Merge branch 'tor-gitlab/mr/392' into maint-0.4.6David Goulet
2021-05-26Prefer mmap()ed consensus files over cached_dir_t entries.Nick Mathewson
Cached_dir_t is a somewhat "legacy" kind of storage when used for consensus documents, and it appears that there are cases when changing our settings causes us to stop updating those entries. This can cause trouble, as @arma found out in #40375, where he changed his settings around, and consensus diff application got messed up: consensus diffs were being _requested_ based on the latest consensus, but were being (incorrectly) applied to a consensus that was no longer the latest one. This patch is a minimal fix for backporting purposes: it has Tor do the same search when applying consensus diffs as we use to request them. This should be sufficient for correct behavior. There's a similar case in GETINFO handling; I've fixed that too. Fixes #40375; bugfix on 0.3.1.1-alpha.
2021-05-25Merge branch 'maint-0.4.4' into maint-0.4.5Alexander Færøy
2021-05-25Merge branch 'maint-0.4.6' into release-0.4.6Alexander Færøy
2021-05-25Merge branch 'maint-0.4.5' into maint-0.4.6Alexander 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-17Merge branch 'maint-0.4.6' into release-0.4.6Nick Mathewson
2021-05-17Merge branch 'maint-0.4.5' into maint-0.4.6Nick Mathewson
2021-05-17Merge remote-tracking branch 'tor-gitlab/mr/387' into maint-0.4.5Nick Mathewson
2021-05-17Merge branch 'maint-0.4.6' into release-0.4.6Nick Mathewson
2021-05-17Merge branch 'maint-0.4.5' into maint-0.4.6Nick Mathewson
2021-05-17Make SAVECONF keep only one backup and add sandbox rules for it. #40317Daniel Pinto
When seccomp sandbox is active, SAVECONF failed because it was not able to save the backup files for torrc. This commit simplifies the implementation of SAVECONF and sandbox by making it keep only one backup of the configuration file.
2021-05-12conn: MetricsPort listener is a listener portDavid Goulet
The connection type for the listener part was missing from the "is connection a listener" function. This lead to our periodic event that retries our listeners to keep trying to bind() again on an already opened MetricsPort. Closes #40370 Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-05-10Merge branch 'maint-0.4.6' into release-0.4.6Nick Mathewson
2021-05-10Merge branch 'ticket40374_046' into maint-0.4.6Nick Mathewson
2021-05-10Merge branch 'maint-0.4.6' into release-0.4.6Nick Mathewson
2021-05-10Bump to 0.4.6.3-rc-devNick Mathewson
2021-05-10Merge branch 'maint-0.4.5' into maint-0.4.6Nick Mathewson
"ours" to avoid version bump.
2021-05-10Update to 0.4.5.8-devNick Mathewson
2021-05-07Fold in the last-minute fixestor-0.4.6.3-rcNick Mathewson
2021-05-07Merge branch 'maint-0.4.5' into maint-0.4.6Nick Mathewson
2021-05-07Merge branch 'maint-0.4.6' into release-0.4.6Nick Mathewson
2021-05-07Merge branch 'ticket40382_045' into maint-0.4.5Nick Mathewson
2021-05-07Add a sandbox workaround for Glibc 2.33Nick Mathewson
This change permits the newfstatat() system call, and fixes issues 40382 (and 40381). This isn't a free change. From the commit: // Libc 2.33 uses this syscall to implement both fstat() and stat(). // // The trouble is that to implement fstat(fd, &st), it calls: // newfstatat(fs, "", &st, AT_EMPTY_PATH) // We can't detect this usage in particular, because "" is a pointer // we don't control. And we can't just look for AT_EMPTY_PATH, since // AT_EMPTY_PATH only has effect when the path string is empty. // // So our only solution seems to be allowing all fstatat calls, which // means that an attacker can stat() anything on the filesystem. That's // not a great solution, but I can't find a better one.
2021-05-07Merge branch 'maint-0.4.5' into maint-0.4.6Nick Mathewson
2021-05-07Merge branch 'maint-0.4.6' into release-0.4.6Nick Mathewson
2021-05-07Merge branch 'maint-0.4.4' into maint-0.4.5Nick 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-07Fold geoip changelog entry into 0.4.6.3-rc changelogNick Mathewson
2021-05-07Merge branch 'maint-0.4.5' into maint-0.4.6Nick Mathewson
2021-05-07Merge branch 'maint-0.4.4' into maint-0.4.5Nick Mathewson
2021-05-07Merge branch 'maint-0.4.6' into release-0.4.6Nick 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-05-07Changelog for 0.4.6.3-rcNick Mathewson
2021-05-07Merge branch 'maint-0.4.6' into release-0.4.6Nick Mathewson
2021-05-07Bump to 0.4.6.3-rcNick Mathewson
2021-05-07Merge branch 'maint-0.4.5' into maint-0.4.6Nick Mathewson
"ours" to avoid version bump.
2021-05-07Bump to 0.4.5.8.Nick Mathewson
2021-05-07Merge branch 'maint-0.4.6' into release-0.4.6David Goulet
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion