]>
git.ipfire.org Git - thirdparty/tor.git/log
rl1987 [Fri, 22 Mar 2019 11:44:02 +0000 (13:44 +0200)]
Refrain from using static buffer for assert failure message; call tor_asprintf() instead
rl1987 [Tue, 5 Mar 2019 16:02:24 +0000 (18:02 +0200)]
Add changes file
rl1987 [Tue, 5 Mar 2019 15:58:31 +0000 (17:58 +0200)]
Use tor_assertf{_nonfatal} in code
rl1987 [Tue, 5 Mar 2019 15:02:03 +0000 (17:02 +0200)]
Silence compiler warnings
rl1987 [Tue, 5 Mar 2019 14:37:14 +0000 (16:37 +0200)]
Also add tor_assertf_nonfatal()
rl1987 [Sun, 18 Mar 2018 13:56:59 +0000 (14:56 +0100)]
Introduce tor_assertf() to allow logging extra error message on assert failure
With format string support!
George Kadianakis [Mon, 4 Mar 2019 16:55:28 +0000 (18:55 +0200)]
Merge branch 'tor-github/pr/723'
George Kadianakis [Mon, 4 Mar 2019 16:52:19 +0000 (18:52 +0200)]
Merge branch 'tor-github/pr/739'
David Goulet [Fri, 1 Mar 2019 14:36:23 +0000 (09:36 -0500)]
Merge branch 'tor-github/pr/718'
Nick Mathewson [Fri, 1 Mar 2019 13:22:43 +0000 (08:22 -0500)]
Merge remote-tracking branch 'tor-github/pr/677'
Nick Mathewson [Fri, 1 Mar 2019 13:20:54 +0000 (08:20 -0500)]
Document crypto_fast_rng_one_in_n.
teor [Fri, 1 Mar 2019 04:17:54 +0000 (14:17 +1000)]
Merge branch 'maint-0.4.0'
teor [Fri, 1 Mar 2019 04:17:31 +0000 (14:17 +1000)]
Merge branch 'maint-0.3.5' into maint-0.4.0
teor [Fri, 1 Mar 2019 04:16:59 +0000 (14:16 +1000)]
Merge branch 'maint-0.3.4' into maint-0.3.5
teor [Fri, 1 Mar 2019 04:16:22 +0000 (14:16 +1000)]
Merge branch 'maint-0.3.3' into maint-0.3.4
teor [Fri, 1 Mar 2019 04:15:59 +0000 (14:15 +1000)]
Merge branch 'maint-0.2.9' into maint-0.3.3
teor [Fri, 1 Mar 2019 04:15:00 +0000 (14:15 +1000)]
Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9
teor [Fri, 1 Mar 2019 04:14:51 +0000 (14:14 +1000)]
Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9
teor [Fri, 1 Mar 2019 04:14:26 +0000 (14:14 +1000)]
Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9
David Goulet [Thu, 28 Feb 2019 18:16:41 +0000 (13:16 -0500)]
maint: Remove 0.3.3 branch from git scripts
It is EOL today: Febuary 28th, 2019
No more releases will occur.
Closes #29616
Signed-off-by: David Goulet <dgoulet@torproject.org>
Nick Mathewson [Thu, 28 Feb 2019 16:22:06 +0000 (11:22 -0500)]
Merge branch 'maint-0.4.0'
Nick Mathewson [Thu, 28 Feb 2019 16:20:26 +0000 (11:20 -0500)]
Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0
George Kadianakis [Thu, 28 Feb 2019 10:32:16 +0000 (12:32 +0200)]
Merge branch 'tor-github/pr/720'
teor [Thu, 28 Feb 2019 00:50:01 +0000 (10:50 +1000)]
Merge branch 'maint-0.4.0'
teor [Thu, 28 Feb 2019 00:49:47 +0000 (10:49 +1000)]
Merge branch 'maint-0.3.5' into maint-0.4.0
teor [Thu, 28 Feb 2019 00:49:33 +0000 (10:49 +1000)]
Merge branch 'maint-0.3.4' into maint-0.3.5
teor [Thu, 28 Feb 2019 00:49:19 +0000 (10:49 +1000)]
Merge branch 'maint-0.3.3' into maint-0.3.4
teor [Thu, 28 Feb 2019 00:48:46 +0000 (10:48 +1000)]
Merge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3
teor [Thu, 28 Feb 2019 00:46:29 +0000 (10:46 +1000)]
Merge branch 'maint-0.4.0'
teor [Thu, 28 Feb 2019 00:46:14 +0000 (10:46 +1000)]
Merge branch 'maint-0.3.5' into maint-0.4.0
teor [Thu, 28 Feb 2019 00:45:59 +0000 (10:45 +1000)]
Merge branch 'maint-0.3.4' into maint-0.3.5
teor [Thu, 28 Feb 2019 00:45:44 +0000 (10:45 +1000)]
Merge branch 'maint-0.3.3' into maint-0.3.4
teor [Thu, 28 Feb 2019 00:45:30 +0000 (10:45 +1000)]
Merge branch 'maint-0.2.9' into maint-0.3.3
Neel Chauhan [Wed, 27 Feb 2019 18:54:23 +0000 (13:54 -0500)]
Set CIRCLAUNCH_NEED_UPTIME in rend_service_relaunch_rendezvous() on a hs_service_requires_uptime_circ()
Nick Mathewson [Wed, 27 Feb 2019 14:59:42 +0000 (09:59 -0500)]
Merge branch 'maint-0.4.0'
Nick Mathewson [Wed, 27 Feb 2019 14:59:33 +0000 (09:59 -0500)]
Merge remote-tracking branch 'tor-github/pr/731' into maint-0.4.0
teor [Wed, 27 Feb 2019 04:57:35 +0000 (14:57 +1000)]
test/shared-random: use sr_state_free_all() rather than sr_state_free()
sr_state_free() was renamed to sr_state_free_all() between 0.2.9 and 0.3.3.
Part of 29599.
teor [Wed, 27 Feb 2019 05:06:39 +0000 (15:06 +1000)]
Merge branch 'bug29599_029' into bug29599_033
teor [Tue, 26 Feb 2019 12:14:30 +0000 (22:14 +1000)]
test/shared-random: Stop leaking shared random state in the unit tests
Stop leaking parts of the shared random state in the shared-random unit
tests.
Fixes bug 29599; bugfix on 0.2.9.1-alpha.
teor [Tue, 26 Feb 2019 23:38:33 +0000 (09:38 +1000)]
Merge branch 'maint-0.4.0'
teor [Tue, 26 Feb 2019 23:38:19 +0000 (09:38 +1000)]
Merge branch 'maint-0.3.5' into maint-0.4.0
teor [Tue, 26 Feb 2019 23:38:04 +0000 (09:38 +1000)]
Merge branch 'maint-0.3.4' into maint-0.3.5
teor [Tue, 26 Feb 2019 23:37:50 +0000 (09:37 +1000)]
Merge branch 'maint-0.3.3' into maint-0.3.4
teor [Tue, 26 Feb 2019 23:37:36 +0000 (09:37 +1000)]
Merge branch 'maint-0.2.9' into maint-0.3.3
George Kadianakis [Tue, 26 Feb 2019 18:15:40 +0000 (20:15 +0200)]
Merge branch 'tor-github/pr/729'
David Goulet [Tue, 26 Feb 2019 16:30:44 +0000 (11:30 -0500)]
Merge branch 'tor-github/pr/655'
David Goulet [Tue, 26 Feb 2019 16:25:16 +0000 (11:25 -0500)]
Merge branch 'maint-0.4.0'
David Goulet [Tue, 26 Feb 2019 16:24:43 +0000 (11:24 -0500)]
Merge branch 'tor-github/pr/638' into maint-0.4.0
David Goulet [Tue, 26 Feb 2019 15:53:09 +0000 (10:53 -0500)]
Merge branch 'maint-0.4.0'
David Goulet [Thu, 14 Feb 2019 19:27:40 +0000 (14:27 -0500)]
maint: Helpful scripts for tor maintenance
Closes #29391
Signed-off-by: David Goulet <dgoulet@torproject.org>
David Goulet [Tue, 26 Feb 2019 15:48:14 +0000 (10:48 -0500)]
Merge branch 'maint-0.3.5'
David Goulet [Tue, 26 Feb 2019 15:48:12 +0000 (10:48 -0500)]
Merge branch 'maint-0.3.5' into maint-0.4.0
David Goulet [Tue, 26 Feb 2019 15:47:54 +0000 (10:47 -0500)]
Merge branch 'tor-github/pr/692' into maint-0.4.0
David Goulet [Tue, 26 Feb 2019 15:46:52 +0000 (10:46 -0500)]
Merge branch 'tor-github/pr/691' into maint-0.3.5
Alexander Færøy [Tue, 26 Feb 2019 14:26:33 +0000 (15:26 +0100)]
Fix crash bug in PT subsystem.
This patch fixes a crash bug (assertion failure) in the PT subsystem
that could get triggered if the user cancels bootstrap via the UI in
TorBrowser. This would cause Tor to call `managed_proxy_destroy()` which
called `process_free()` after it had called `process_terminate()`. This
leads to a crash when the various process callbacks returns with data
after the `process_t` have been freed using `process_free()`.
We solve this issue by ensuring that everywhere we call
`process_terminate()` we make sure to detach the `managed_proxy_t` from
the `process_t` (by calling `process_set_data(process, NULL)`) and avoid
calling `process_free()` at all in the transports code. Instead we just
call `process_terminate()` and let the process exit callback in
`managed_proxy_exit_callback()` handle the `process_free()` call by
returning true to the process subsystem.
See: https://bugs.torproject.org/29562
Nick Mathewson [Tue, 26 Feb 2019 12:27:50 +0000 (07:27 -0500)]
Merge branch 'maint-0.4.0'
Nick Mathewson [Tue, 26 Feb 2019 12:27:42 +0000 (07:27 -0500)]
Merge remote-tracking branch 'tor-github/pr/726' into maint-0.4.0
George Kadianakis [Tue, 26 Feb 2019 10:35:14 +0000 (12:35 +0200)]
Merge branch 'tor-github/pr/698'
George Kadianakis [Tue, 26 Feb 2019 10:33:23 +0000 (12:33 +0200)]
Merge branch 'tor-github/pr/611'
Kris Katterjohn [Fri, 25 Jan 2019 21:52:40 +0000 (15:52 -0600)]
Fix some error-checking logic and a misleading error message
When IPv4Only (IPv6Only) was used but the address could not be
interpreted as a IPv4 (IPv6) address, the error message referred
to the wrong IP version.
This also fixes up the error-checking logic so it's more precise
about what's being checked.
Fixes bug 13221; bugfix on 0.2.3.9-alpha
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
Nick Mathewson [Mon, 25 Feb 2019 18:33:39 +0000 (13:33 -0500)]
Merge remote-tracking branch 'tor-github/pr/684'
Nick Mathewson [Mon, 25 Feb 2019 13:55:25 +0000 (08:55 -0500)]
Re-enable and fix unit test for nofork mappings
This test was previously written to use the contents of the system
headers to decide whether INHERIT_NONE or INHERIT_ZERO was going to
work. But that won't work across different environments, such as
(for example) when the kernel doesn't match the headers. Instead,
we add a testing-only feature to the code to track which of these
options actually worked, and verify that it behaved as we expected.
Closes ticket 29541; bugfix not on any released version of Tor.
Nick Mathewson [Sun, 24 Feb 2019 22:17:16 +0000 (17:17 -0500)]
Merge remote-tracking branch 'tor-github/pr/646'
Nick Mathewson [Sun, 24 Feb 2019 22:02:35 +0000 (17:02 -0500)]
Merge branch 'ticket29065_squashed'
rl1987 [Thu, 7 Feb 2019 15:05:14 +0000 (17:05 +0200)]
Fix shellcheck SC2006 warnings in test_switch_id.sh
Neel Chauhan [Fri, 22 Feb 2019 18:36:02 +0000 (13:36 -0500)]
When a DirAuth checks reachability on itself and has IPv6, mark it as reachable
George Kadianakis [Fri, 22 Feb 2019 14:07:57 +0000 (16:07 +0200)]
Merge remote-tracking branch 'nickm/thread_rng'
Nick Mathewson [Thu, 21 Feb 2019 18:35:33 +0000 (13:35 -0500)]
Update pre-commit.git-hook for ticket 29553
- handle older source layout
- handle empty changes directories
- "set -e" so that we exit if there's a problem.
Nick Mathewson [Thu, 21 Feb 2019 18:25:54 +0000 (13:25 -0500)]
Merge branch 'maint-0.4.0'
"ours" to avoid version bump.
Nick Mathewson [Thu, 21 Feb 2019 18:25:33 +0000 (13:25 -0500)]
Bump to 0.4.0.2-alpha-dev
Nick Mathewson [Thu, 21 Feb 2019 18:25:02 +0000 (13:25 -0500)]
Merge branch 'maint-0.3.5' into maint-0.4.0
"ours" to avoid version bump.
Nick Mathewson [Thu, 21 Feb 2019 18:24:42 +0000 (13:24 -0500)]
Bump to 0.3.5.8-dev
Nick Mathewson [Thu, 21 Feb 2019 18:23:52 +0000 (13:23 -0500)]
Merge branch 'maint-0.3.4' into maint-0.3.5
"ours" to avoid version bump.
Nick Mathewson [Thu, 21 Feb 2019 18:23:46 +0000 (13:23 -0500)]
Bump to 0.3.4.11-dev
Nick Mathewson [Thu, 21 Feb 2019 18:23:22 +0000 (13:23 -0500)]
Merge branch 'maint-0.3.3' into maint-0.3.4
"ours" to avoid version bump
Nick Mathewson [Thu, 21 Feb 2019 18:22:56 +0000 (13:22 -0500)]
Bump to 0.3.3.12-dev
Nick Mathewson [Thu, 21 Feb 2019 15:33:16 +0000 (10:33 -0500)]
Remove changes entries for fixes that appeared in 0.4.0.2-alpha
Nick Mathewson [Thu, 21 Feb 2019 15:32:08 +0000 (10:32 -0500)]
Copy today's releases into changelogs and releasenotes.
Nick Mathewson [Thu, 21 Feb 2019 15:08:14 +0000 (10:08 -0500)]
Merge branch 'maint-0.3.5' into maint-0.4.0
Nick Mathewson [Thu, 21 Feb 2019 15:08:14 +0000 (10:08 -0500)]
Merge branch 'maint-0.3.4' into maint-0.3.5
Nick Mathewson [Thu, 21 Feb 2019 15:08:14 +0000 (10:08 -0500)]
Merge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Thu, 21 Feb 2019 15:08:14 +0000 (10:08 -0500)]
Merge branch 'maint-0.4.0'
David Goulet [Thu, 24 Jan 2019 15:52:08 +0000 (10:52 -0500)]
kist: Don't write above the highwater outbuf mark
KIST works by computing how much should be allowed to write to the kernel for
a given socket, and then it writes that amount to the outbuf.
The problem is that it could be possible that the outbuf already has lots of
data in it from a previous scheduling round (because the kernel is full/busy
and Tor was not able to flush the outbuf yet). KIST ignores that the outbuf
has been filling (is above its "highwater") and writes more anyway. The end
result is that the outbuf length would exceed INT_MAX, hence causing an
assertion error and a corresponding "Bug()" message to get printed to the
logs.
This commit makes it for KIST to take into account the outbuf length when
computing the available space.
Bug found and patch by Rob Jansen.
Closes #29168. TROVE-2019-001.
Signed-off-by: David Goulet <dgoulet@torproject.org>
Nick Mathewson [Thu, 21 Feb 2019 14:52:35 +0000 (09:52 -0500)]
Merge branch 'maint-0.4.0'
"ours" to avoid version bump
Nick Mathewson [Thu, 21 Feb 2019 14:52:27 +0000 (09:52 -0500)]
Bump version to 0.4.0.2-alpha
Nick Mathewson [Thu, 21 Feb 2019 14:51:38 +0000 (09:51 -0500)]
Merge branch 'maint-0.3.5' into maint-0.4.0
"ours" to avoid version bump.
Nick Mathewson [Thu, 21 Feb 2019 14:51:29 +0000 (09:51 -0500)]
Bump to 0.3.5.8
Nick Mathewson [Thu, 21 Feb 2019 14:50:46 +0000 (09:50 -0500)]
Merge branch 'maint-0.3.4' into maint-0.3.5
"ours" to avoid version bump.
Nick Mathewson [Thu, 21 Feb 2019 14:50:22 +0000 (09:50 -0500)]
Bump to 0.3.4.11
Nick Mathewson [Thu, 21 Feb 2019 14:49:56 +0000 (09:49 -0500)]
Merge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Thu, 21 Feb 2019 14:49:48 +0000 (09:49 -0500)]
Update to 0.3.3.12
Nick Mathewson [Thu, 21 Feb 2019 14:10:34 +0000 (09:10 -0500)]
Merge branch 'maint-0.4.0'
Nick Mathewson [Thu, 21 Feb 2019 14:06:51 +0000 (09:06 -0500)]
Fix a goofy change from
abcde10fce that broke test-slow linking
boklm tracked this down, and it doesn't make sense. It caused
This change goes back to the previous LDFLAGS line.
Nick Mathewson [Wed, 20 Feb 2019 17:21:23 +0000 (12:21 -0500)]
Remove all uses of weak_rng.
I'm not removing the weak_rng code itself yet, since it is possible
that we will want to revert one of these.
Nick Mathewson [Wed, 20 Feb 2019 17:21:05 +0000 (12:21 -0500)]
Add a convenience macro to get a fast one-in-n calculation
David Goulet [Wed, 20 Feb 2019 17:15:26 +0000 (12:15 -0500)]
Merge branch 'tor-github/pr/695'
David Goulet [Wed, 20 Feb 2019 17:09:52 +0000 (12:09 -0500)]
Merge branch 'tor-github/pr/658'
David Goulet [Wed, 20 Feb 2019 17:09:02 +0000 (12:09 -0500)]
Merge branch 'tor-github/pr/687'
David Goulet [Wed, 20 Feb 2019 17:06:39 +0000 (12:06 -0500)]
Merge branch 'tor-github/pr/700'
rl1987 [Wed, 13 Feb 2019 13:50:09 +0000 (15:50 +0200)]
Use setrlimit instead of ulimit -c in backtrace tests