]>
git.ipfire.org Git - thirdparty/tor.git/log
rl1987 [Sun, 11 Nov 2018 15:50:43 +0000 (17:50 +0200)]
Fix most instances of SC2086 warning
rl1987 [Sun, 11 Nov 2018 15:44:41 +0000 (17:44 +0200)]
Fix shellcheck SC2006 warnings in 'coverage' script
Nick Mathewson [Thu, 15 Nov 2018 14:06:18 +0000 (09:06 -0500)]
Merge branch 'maint-0.3.5'
Nick Mathewson [Thu, 15 Nov 2018 14:06:18 +0000 (09:06 -0500)]
Merge branch 'maint-0.3.4' into maint-0.3.5
teor [Thu, 15 Nov 2018 08:57:39 +0000 (18:57 +1000)]
Appveyor: add comments to the config file
Documentation for 28399, 28454, and previous fixes.
teor [Thu, 15 Nov 2018 08:32:52 +0000 (18:32 +1000)]
Appveyor: manually add zstd flags to configure
The mingw zstd from MSYS2 doesn't come with a pkg-config file.
Fixes 28454 on Tor 0.3.4.1-alpha.
teor [Thu, 15 Nov 2018 04:32:53 +0000 (14:32 +1000)]
Appveyor: remove incorrect OpenSSL path
Fixes 28399 on 0.3.4.1-alpha.
teor [Thu, 15 Nov 2018 03:43:20 +0000 (13:43 +1000)]
Appveyor: Improve diagnostics
Stop installing MSYS2 packages.
We're compiling for mingw, so we only need mingw packages.
Run pacman in verbose mode.
Explicitly install pkg-config and xz, to future-proof our builds.
Diagnostics for 28399.
Nick Mathewson [Wed, 14 Nov 2018 20:43:49 +0000 (15:43 -0500)]
Merge branch 'maint-0.3.5'
Nick Mathewson [Wed, 14 Nov 2018 20:43:46 +0000 (15:43 -0500)]
Merge branch 'ticket27750_034_01_squashed' into maint-0.3.5
David Goulet [Tue, 13 Nov 2018 15:22:10 +0000 (10:22 -0500)]
conn: Close the read side of a closing connection when write limit is reached
In conn_close_if_marked(), we can decide to keep a connection open that still
has data to flush on the wire if it is being rate limited on the write side.
However, in this process, we were also looking at the read() side which can
still have token in its bucket and thus not stop the reading. This lead to a
BUG() introduced in 0.3.4.1-alpha that was expecting the read side to be
closed due to the rate limit but which only applies on the write side.
This commit removes any bandwidth check on the read side and simply stop the
read side on the connection regardless of the bucket state. If we keep the
connection open to flush it out before close, we should not read anything.
Fixes #27750
Signed-off-by: David Goulet <dgoulet@torproject.org>
Nick Mathewson [Wed, 14 Nov 2018 12:56:52 +0000 (07:56 -0500)]
Merge branch 'maint-0.3.5'
Nick Mathewson [Wed, 14 Nov 2018 12:56:48 +0000 (07:56 -0500)]
Merge remote-tracking branch 'teor/bug28441-035' into maint-0.3.5
Nick Mathewson [Wed, 14 Nov 2018 12:55:07 +0000 (07:55 -0500)]
Merge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Wed, 14 Nov 2018 12:55:07 +0000 (07:55 -0500)]
Merge branch 'maint-0.3.5'
Nick Mathewson [Wed, 14 Nov 2018 12:55:07 +0000 (07:55 -0500)]
Merge branch 'maint-0.3.4' into maint-0.3.5
Nick Mathewson [Wed, 14 Nov 2018 12:54:57 +0000 (07:54 -0500)]
Work around check-spaces.
Nick Mathewson [Wed, 14 Nov 2018 12:51:36 +0000 (07:51 -0500)]
Changes file for bug 28419
Martin Kepplinger [Tue, 13 Nov 2018 09:09:29 +0000 (10:09 +0100)]
libtorrunner: fix memory leak in child() error path
This avoids leaking memory in case libtorrunner's child() function fails.
Nick Mathewson [Wed, 14 Nov 2018 12:45:58 +0000 (07:45 -0500)]
Merge branch 'maint-0.3.5'
Taylor Yu [Tue, 13 Nov 2018 22:50:00 +0000 (16:50 -0600)]
Fix Doxyfile for 0.3.5 source tree moves
Make Doxygen work again after the 0.3.5 source tree moves. Fixes bug
28435; bugfix on 0.3.5.1-alpha.
Nick Mathewson [Wed, 14 Nov 2018 12:42:56 +0000 (07:42 -0500)]
Merge branch 'maint-0.3.5'
teor [Wed, 7 Nov 2018 08:48:21 +0000 (18:48 +1000)]
log: stop talking about the Named flag in log messages
Clients have ignored the Named flag since 0.3.2.
Fixes bug 28441; bugfix on 0.3.2.1-alpha.
teor [Wed, 7 Nov 2018 08:59:08 +0000 (18:59 +1000)]
comment: circuit_list_path_impl() does not check Named any more
teor [Wed, 7 Nov 2018 08:47:42 +0000 (18:47 +1000)]
comment: Fix a typo in nodes_in_same_family()
teor [Wed, 7 Nov 2018 08:46:39 +0000 (18:46 +1000)]
doc: Remove an outdated sentence from KeepalivePeriod in the man page
Nick Mathewson [Tue, 13 Nov 2018 21:48:26 +0000 (16:48 -0500)]
Merge branch 'maint-0.3.5'
Nick Mathewson [Tue, 13 Nov 2018 21:48:21 +0000 (16:48 -0500)]
Merge branch 'bug28183_029' into maint-0.3.5
David Goulet [Tue, 13 Nov 2018 15:48:23 +0000 (10:48 -0500)]
Merge branch 'tor-github/pr/501'
David Goulet [Tue, 13 Nov 2018 15:43:03 +0000 (10:43 -0500)]
Merge branch 'maint-0.3.5'
David Goulet [Tue, 13 Nov 2018 15:37:25 +0000 (10:37 -0500)]
Merge branch 'tor-github/pr/487' into maint-0.3.5
Neel Chauhan [Tue, 13 Nov 2018 15:33:51 +0000 (10:33 -0500)]
Comment for rend_cache_failure in feature/rend/rendcache.c: "usuable" should be "usable"
Nick Mathewson [Tue, 13 Nov 2018 13:27:29 +0000 (08:27 -0500)]
Merge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Tue, 13 Nov 2018 13:27:29 +0000 (08:27 -0500)]
Merge branch 'maint-0.3.5'
Nick Mathewson [Tue, 13 Nov 2018 13:27:29 +0000 (08:27 -0500)]
Merge branch 'maint-0.3.4' into maint-0.3.5
Nick Mathewson [Tue, 13 Nov 2018 13:27:17 +0000 (08:27 -0500)]
Merge branch 'maint-0.2.9' into maint-0.3.3
Nick Mathewson [Tue, 13 Nov 2018 13:26:51 +0000 (08:26 -0500)]
Merge branch 'bug28413_029' into maint-0.2.9
Nick Mathewson [Mon, 12 Nov 2018 20:39:28 +0000 (15:39 -0500)]
Fix a compiler warning in aes.c.
Apparently some freebsd compilers can't tell that 'c' will never
be used uninitialized.
Fixes bug 28413; bugfix on 0.2.9.3-alpha when we added support for
longer AES keys to this function.
Nick Mathewson [Mon, 12 Nov 2018 13:23:58 +0000 (08:23 -0500)]
seccomp2: Add "shutdown" to the list of permitted system calls.
We don't use this syscall, but openssl apparently does.
(This syscall puts a socket into a half-closed state. Don't worry:
It doesn't shut down the system or anything.)
Fixes bug 28183; bugfix on 0.2.5.1-alpha where the sandbox was
introduced.
Nick Mathewson [Sun, 11 Nov 2018 23:05:45 +0000 (18:05 -0500)]
Merge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Sun, 11 Nov 2018 23:05:45 +0000 (18:05 -0500)]
Merge branch 'maint-0.3.5'
Nick Mathewson [Sun, 11 Nov 2018 23:05:45 +0000 (18:05 -0500)]
Merge branch 'maint-0.3.4' into maint-0.3.5
Nick Mathewson [Sun, 11 Nov 2018 23:05:45 +0000 (18:05 -0500)]
Merge branch 'maint-0.2.9' into maint-0.3.3
Nick Mathewson [Sun, 11 Nov 2018 23:03:50 +0000 (18:03 -0500)]
Fix a bug in usage of SSL_set1_groups_list()
Apparently, even though the manpage says it returns an int, it
can return a long instead and cause a warning.
Bug not in any released Tor. Part of #28399
Nick Mathewson [Sun, 11 Nov 2018 16:57:54 +0000 (11:57 -0500)]
Merge branch 'maint-0.3.5'
Nick Mathewson [Sun, 11 Nov 2018 16:57:53 +0000 (11:57 -0500)]
Merge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Sun, 11 Nov 2018 16:57:53 +0000 (11:57 -0500)]
Merge branch 'maint-0.3.4' into maint-0.3.5
Nick Mathewson [Sun, 11 Nov 2018 16:57:52 +0000 (11:57 -0500)]
Merge branch 'maint-0.2.9' into maint-0.3.3
Karsten Loesing [Sun, 11 Nov 2018 10:25:59 +0000 (11:25 +0100)]
Update geoip and geoip6 to the November 6 2018 database.
Nick Mathewson [Sat, 10 Nov 2018 03:17:18 +0000 (22:17 -0500)]
Annotate subsystem list with their levels.
Nick Mathewson [Fri, 9 Nov 2018 20:01:49 +0000 (15:01 -0500)]
Merge branch 'subsystems'
Nick Mathewson [Fri, 9 Nov 2018 16:56:26 +0000 (11:56 -0500)]
Log before performing a subsystem operation
Nick Mathewson [Fri, 9 Nov 2018 16:15:27 +0000 (11:15 -0500)]
Add list of levels in subsystem_list.c
Nick Mathewson [Fri, 9 Nov 2018 16:12:12 +0000 (11:12 -0500)]
Rename subsystem callback functions to make them consistent
Nick Mathewson [Fri, 9 Nov 2018 16:00:31 +0000 (11:00 -0500)]
fixup! Make initialization for the "err" library into a subsystem.
Check for failure to install backtrace handler.
Nick Mathewson [Fri, 9 Nov 2018 15:58:20 +0000 (10:58 -0500)]
Document that subsystem callbacks are optional.
Nick Mathewson [Fri, 9 Nov 2018 15:55:18 +0000 (10:55 -0500)]
Explain that configuration should happen elsewhere, but not init.
Nick Mathewson [Fri, 9 Nov 2018 15:49:48 +0000 (10:49 -0500)]
Merge branch 'maint-0.3.5'
Nick Mathewson [Fri, 9 Nov 2018 15:49:47 +0000 (10:49 -0500)]
Merge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 9 Nov 2018 15:49:47 +0000 (10:49 -0500)]
Merge branch 'maint-0.3.4' into maint-0.3.5
Nick Mathewson [Fri, 9 Nov 2018 15:49:47 +0000 (10:49 -0500)]
Merge branch 'maint-0.2.9' into maint-0.3.3
Nick Mathewson [Fri, 9 Nov 2018 15:49:43 +0000 (10:49 -0500)]
Merge branch 'bug28245_029' into maint-0.2.9
Nick Mathewson [Fri, 9 Nov 2018 15:10:25 +0000 (10:10 -0500)]
Always declare groups when building with openssl 1.1.1 APIs
Failing to do on clients was causing TLS 1.3 negotiation to fail.
Fixes bug 28245; bugfix on 0.2.9.15, when we added TLS 1.3 support.
Nick Mathewson [Thu, 8 Nov 2018 14:02:05 +0000 (09:02 -0500)]
Merge branch 'maint-0.3.5'
Nick Mathewson [Thu, 8 Nov 2018 14:02:03 +0000 (09:02 -0500)]
Copy changelog to maint-0.3.5 so master will get it.
Nick Mathewson [Thu, 8 Nov 2018 14:01:08 +0000 (09:01 -0500)]
Merge branch 'maint-0.3.5'
"ours" to avoid version bump.
Nick Mathewson [Thu, 8 Nov 2018 14:00:59 +0000 (09:00 -0500)]
Bump version to 0.3.5.4-alpha-dev.
Nick Mathewson [Wed, 7 Nov 2018 21:27:26 +0000 (16:27 -0500)]
Merge branch 'maint-0.3.5'
Nick Mathewson [Wed, 7 Nov 2018 21:27:20 +0000 (16:27 -0500)]
Make the hibernate.c changes for systemd compile.
Nick Mathewson [Wed, 7 Nov 2018 19:40:34 +0000 (14:40 -0500)]
Merge branch 'maint-0.3.5'
"ours" to avoid version bump.
Nick Mathewson [Wed, 7 Nov 2018 19:40:26 +0000 (14:40 -0500)]
Bump to 0.3.5.4-alpha
Nick Mathewson [Wed, 7 Nov 2018 16:21:13 +0000 (11:21 -0500)]
Merge remote-tracking branch 'tor-github/pr/271'
Nick Mathewson [Wed, 7 Nov 2018 16:17:32 +0000 (11:17 -0500)]
Merge branch 'maint-0.3.5'
Nick Mathewson [Wed, 7 Nov 2018 16:16:52 +0000 (11:16 -0500)]
Merge remote-tracking branch 'teor/ticket28318-035' into maint-0.3.5
Roger Dingledine [Wed, 7 Nov 2018 16:02:26 +0000 (11:02 -0500)]
simplify now that it uses tor's copyright and license
Nick Mathewson [Wed, 7 Nov 2018 15:54:03 +0000 (10:54 -0500)]
Change version on master to 0.4.0.0-alpha-dev.
Nick Mathewson [Wed, 7 Nov 2018 15:47:29 +0000 (10:47 -0500)]
Merge branch 'ticket27225_squashed'
Nick Mathewson [Fri, 19 Oct 2018 19:04:45 +0000 (15:04 -0400)]
Memoize summarize_protover_flags()
Our tests showed that this function is responsible for a huge number
of our malloc/free() calls. It's a prime candidate for being
memoized.
Closes ticket 27225.
Nick Mathewson [Wed, 7 Nov 2018 15:37:02 +0000 (10:37 -0500)]
Switch ctassert.h to 3bsd (with permission)
Neel Chauhan [Tue, 6 Nov 2018 22:04:08 +0000 (17:04 -0500)]
At intro points, don't close circuits on NACKs
Nick Mathewson [Tue, 6 Nov 2018 21:59:39 +0000 (16:59 -0500)]
Allow lib/cc to include its own files.
Nick Mathewson [Tue, 6 Nov 2018 20:42:18 +0000 (15:42 -0500)]
Change copyright statement (with permission)
Nick Mathewson [Tue, 6 Nov 2018 20:41:32 +0000 (15:41 -0500)]
Remove a tab.
Nick Mathewson [Tue, 6 Nov 2018 20:41:14 +0000 (15:41 -0500)]
Add parentheses to the ctassert macro expansions
Nick Mathewson [Tue, 6 Nov 2018 20:39:58 +0000 (15:39 -0500)]
Add a user of CTASSERT().
Taylor R Campbell [Tue, 23 Oct 2018 23:53:39 +0000 (23:53 +0000)]
New macro CTASSERT(condition) to assert condition at compile-time.
To get it, use: #include "lib/cc/ctassert.h"
Nick Mathewson [Tue, 6 Nov 2018 20:35:45 +0000 (15:35 -0500)]
Merge remote-tracking branch 'tor-github/pr/466'
Nick Mathewson [Tue, 6 Nov 2018 20:33:25 +0000 (15:33 -0500)]
Merge remote-tracking branch 'tor-github/pr/464'
Nick Mathewson [Tue, 6 Nov 2018 20:22:11 +0000 (15:22 -0500)]
Merge branch 'maint-0.3.5'
Nick Mathewson [Tue, 6 Nov 2018 20:21:45 +0000 (15:21 -0500)]
Merge remote-tracking branch 'tor-github/pr/474' into maint-0.3.5
Nick Mathewson [Tue, 6 Nov 2018 20:20:01 +0000 (15:20 -0500)]
Merge branch 'maint-0.3.5'
Nick Mathewson [Tue, 6 Nov 2018 20:19:04 +0000 (15:19 -0500)]
Merge remote-tracking branch 'tor-github/pr/484' into maint-0.3.5
Nick Mathewson [Tue, 6 Nov 2018 20:17:52 +0000 (15:17 -0500)]
Merge branch 'maint-0.3.5'
Nick Mathewson [Tue, 6 Nov 2018 20:17:19 +0000 (15:17 -0500)]
Add a changes file for bug 28303
Kris Katterjohn [Sat, 3 Nov 2018 19:28:27 +0000 (14:28 -0500)]
Include sys/time.h in timers.c and time_fmt.c
This fixes compilation on OpenBSD.
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
Roger Dingledine [Sun, 4 Nov 2018 12:30:46 +0000 (07:30 -0500)]
refuse to start with relative paths + RunAsDaemon
Resume refusing to start with relative file paths and RunAsDaemon
set (regression from the fix for bug 22731).
Fixes bug 28298; bugfix on 0.3.3.1-alpha.
Nick Mathewson [Tue, 6 Nov 2018 14:18:01 +0000 (09:18 -0500)]
Merge branch 'bug28348_036'
Nick Mathewson [Tue, 6 Nov 2018 14:16:25 +0000 (09:16 -0500)]
Merge branch 'maint-0.3.5'
Nick Mathewson [Tue, 6 Nov 2018 12:43:27 +0000 (07:43 -0500)]
Merge branch 'bug28348_035' into bug28348_036
Nick Mathewson [Tue, 6 Nov 2018 12:42:55 +0000 (07:42 -0500)]
Merge branch 'bug28348_034' into bug28348_035