summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-10Merge branch 'maint-0.4.4' into maint-0.4.5Nick Mathewson
2021-06-10Merge branch 'maint-0.4.6' into release-0.4.6Nick 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 file.Nick Mathewson
2021-06-07Start ReleaseNotes for 0.4.6.5.Nick Mathewson
This is a sorted version of the entries from the earlier 0.4.6.x releases, excluding those that fixed bugs against 0.4.6.x, or those that already appeared in 0.4.5.8.
2021-06-07Copy 0.4.5.8 changelog in to changelog and releasenotes.Nick Mathewson
2021-06-07Begin a ChangeLog for 0.4.6.5Nick Mathewson
2021-06-07Merge branch 'maint-0.4.6' into release-0.4.6Nick Mathewson
2021-06-07Bump to 0.4.6.5Nick Mathewson
2021-06-07Merge branch 'maint-0.4.5' into maint-0.4.6Nick Mathewson
"ours" to avoid version bump.
2021-06-07Bump to 0.4.5.9.Nick Mathewson
2021-06-07Merge branch 'maint-0.4.4' into maint-0.4.5Nick Mathewson
"ours" to avoid version bump.
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-06-01Merge branch 'maint-0.4.6' into release-0.4.6Nick Mathewson
2021-06-01Merge branch 'bug40175_045' into maint-0.4.6Nick Mathewson
2021-06-01changes file for #40175Nick Mathewson
2021-06-01Merge branch 'maint-0.4.6' into release-0.4.6David Goulet
2021-06-01Merge branch 'tor-gitlab/mr/393' into maint-0.4.6David Goulet
2021-05-28Merge branch 'maint-0.4.6' into release-0.4.6Nick Mathewson
2021-05-28Bump to 0.4.6.4-rc-devNick Mathewson
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-27Upgrade and rate-limit compression failure message.Nick Mathewson
Without this message getting logged at 'WARN', it's hard to contextualize the messages we get about compression bombs, so this message should fix #40175. I'm rate-limiting this, however, since it _could_ get spammy if somebody on the network starts acting up. (Right now it should be very quiet; I've asked Sebastian to check it, and he says that he doesn't hit this message in practice.) Closes #40175.
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.3.5' into maint-0.4.4Alexander Færøy
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-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-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
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion