torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
30,615 Commits 53 Branches 631 Tags
bebfae56822ff501519fbd913d2293e8e9230bb8
Commit Graph

7386 Commits

Author SHA1 Message Date
Nick Mathewson bebfae5682 start changelog for 0.3.5.5-alpha 2018-11-16 08:25:48 -05:00
Nick Mathewson 09c5f75aaf Merge branch 'maint-0.3.5' into release-0.3.5 2018-11-15 09:06:18 -05:00
Nick Mathewson a9db07f325 Merge branch 'maint-0.3.4' into maint-0.3.5 2018-11-15 09:06:18 -05:00
teor 83c1baca16 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.
 2018-11-15 19:23:37 +10:00
teor 540c833f20 Appveyor: remove incorrect OpenSSL path 
Fixes 28399 on 0.3.4.1-alpha.
 2018-11-15 19:23:33 +10:00
Nick Mathewson 962db831c1 Merge branch 'maint-0.3.5' into release-0.3.5 2018-11-14 15:43:49 -05:00
Nick Mathewson d598d834f5 Merge branch 'ticket27750_034_01_squashed' into maint-0.3.5 2018-11-14 15:43:46 -05:00
David Goulet c99f220f78 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>
 2018-11-14 15:42:52 -05:00
Nick Mathewson d098dda776 Merge branch 'maint-0.3.5' into release-0.3.5 2018-11-14 07:56:52 -05:00
Nick Mathewson a58b19465d Merge remote-tracking branch 'teor/bug28441-035' into maint-0.3.5 2018-11-14 07:56:48 -05:00
Nick Mathewson 1043532a51 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-11-14 07:55:07 -05:00
Nick Mathewson 900d9a8601 Merge branch 'maint-0.3.5' into release-0.3.5 2018-11-14 07:55:07 -05:00
Nick Mathewson eba989bf0e Merge branch 'maint-0.3.4' into maint-0.3.5 2018-11-14 07:55:07 -05:00
Nick Mathewson 26fd7c1d9c Changes file for bug 28419 2018-11-14 07:51:36 -05:00
Nick Mathewson 18df0ffbf3 Merge branch 'maint-0.3.5' into release-0.3.5 2018-11-14 07:45:58 -05:00
Taylor Yu 763ccd0928 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.
 2018-11-14 07:45:55 -05:00
teor 16ca6fdfdb 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.
 2018-11-14 18:16:34 +10:00
Nick Mathewson c45e2f805f Merge branch 'maint-0.3.5' into release-0.3.5 2018-11-13 16:48:26 -05:00
Nick Mathewson 021187f915 Merge branch 'bug28183_029' into maint-0.3.5 2018-11-13 16:48:21 -05:00
David Goulet a5f3a67a82 Merge branch 'maint-0.3.5' into release-0.3.5 2018-11-13 10:43:02 -05:00
David Goulet 6f2151be9a Merge branch 'tor-github/pr/487' into maint-0.3.5 2018-11-13 10:37:25 -05:00
Nick Mathewson 42be1c668b Merge branch 'maint-0.3.3' into maint-0.3.4 2018-11-13 08:27:29 -05:00
Nick Mathewson 51d9444823 Merge branch 'maint-0.3.5' into release-0.3.5 2018-11-13 08:27:29 -05:00
Nick Mathewson ae4c94bb64 Merge branch 'maint-0.3.4' into maint-0.3.5 2018-11-13 08:27:29 -05:00
Nick Mathewson 54d1a2d805 Merge branch 'maint-0.2.9' into maint-0.3.3 2018-11-13 08:27:17 -05:00
Nick Mathewson 1a11702a9a 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.
 2018-11-12 15:39:28 -05:00
Nick Mathewson 0e5378feec 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.
 2018-11-12 08:23:58 -05:00
Nick Mathewson 9617b596ba Merge branch 'maint-0.3.5' into release-0.3.5 2018-11-11 11:57:54 -05:00
Nick Mathewson 6b2ff4fff8 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-11-11 11:57:53 -05:00
Nick Mathewson 76ed869ff9 Merge branch 'maint-0.3.4' into maint-0.3.5 2018-11-11 11:57:53 -05:00
Nick Mathewson d0c3723c38 Merge branch 'maint-0.2.9' into maint-0.3.3 2018-11-11 11:57:52 -05:00
Karsten Loesing 5ba3d09a89 Update geoip and geoip6 to the November 6 2018 database. 2018-11-11 11:25:59 +01:00
Nick Mathewson 78b85f760c Merge branch 'maint-0.3.5' into release-0.3.5 2018-11-09 10:49:48 -05:00
Nick Mathewson 591a189fa4 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-11-09 10:49:47 -05:00
Nick Mathewson 2ac2d0a426 Merge branch 'maint-0.3.4' into maint-0.3.5 2018-11-09 10:49:47 -05:00
Nick Mathewson c06b7f090c Merge branch 'maint-0.2.9' into maint-0.3.3 2018-11-09 10:49:47 -05:00
Nick Mathewson 1ba1a1ceca 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.
 2018-11-09 10:10:25 -05:00
Nick Mathewson ef3ec11a5b Begin work on an 0.3.5.4-alpha changelog 2018-11-07 14:46:33 -05:00
Nick Mathewson aea2b04467 Merge remote-tracking branch 'teor/ticket28318-035' into maint-0.3.5 2018-11-07 11:16:52 -05:00
Neel Chauhan f89f14802e At intro points, don't close circuits on NACKs 2018-11-06 17:04:08 -05:00
Nick Mathewson c60f3ea607 Merge remote-tracking branch 'tor-github/pr/474' into maint-0.3.5 2018-11-06 15:21:45 -05:00
Nick Mathewson 8a5590ebac Merge remote-tracking branch 'tor-github/pr/484' into maint-0.3.5 2018-11-06 15:19:04 -05:00
Nick Mathewson 67abf55d6b Add a changes file for bug 28303 2018-11-06 15:17:19 -05:00
Roger Dingledine 3a2cb83685 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.
 2018-11-06 15:50:56 +01:00
Nick Mathewson 9431d35074 Merge branch 'bug28348_034' into bug28348_035 2018-11-06 07:42:55 -05:00
Nick Mathewson 2aff02eb3d Actually disable NEED_NET periodic events when DisableNetwork is set 
Fixes bug 28348; bugfix on 0.3.4.1-alpha
 2018-11-06 07:40:02 -05:00
teor 368aeaadff Appveyor: Add Windows Server 2016 to tor's build matrix 
Build tor on Windows Server 2012 R2 and Windows Server 2016 using
Appveyor's CI.

Closes ticket 28318.
 2018-11-05 16:21:58 +10:00
teor bd0e38dcfe systemd: allow tor some time to shut down after ShutdownWaitLength expires 
This commit upstreams the Debian package setting of 60 seconds for
TimeoutStopSec, but applies it to startup and shutdown.

Part of 28113.
 2018-11-05 11:49:19 +10:00
Alex Xu (Hello71) 0d6d3e1f26 Notify systemd of ShutdownWaitLength 2018-11-05 11:46:28 +10:00
Nick Mathewson 996f24fcd3 Merge branch 'bug27968_squashed' into maint-0.3.5 2018-11-02 13:14:32 -04:00