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,592 Commits 53 Branches 631 Tags
e65527a9ac74dfa697f485e36932b0aec6bb057e
Commit Graph
30592 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson e65527a9ac Merge branch 'maint-0.3.5' into release-0.3.5 2018-11-15 16:11:29 -05:00
Nick Mathewson 4b6b58ed8e Merge branch 'bug27740_035_fix' into maint-0.3.5 2018-11-15 16:11:06 -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 27b9170475 Appveyor: add comments to the config file 
Documentation for 28399, 28454, and previous fixes.
 2018-11-15 19:23:41 +10: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
teor 4c3d61b5f2 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.
 2018-11-15 19:23:29 +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 db3acb3aa3 Work around check-spaces. 2018-11-14 07:54:57 -05:00
Nick Mathewson 26fd7c1d9c Changes file for bug 28419 2018-11-14 07:51:36 -05:00
Martin Kepplinger 7ba1f39116 libtorrunner: fix memory leak in child() error path 
This avoids leaking memory in case libtorrunner's child() function fails.
 2018-11-14 07:49:51 -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
Nick Mathewson 1ba17cc815 Merge branch 'maint-0.3.5' into release-0.3.5 2018-11-14 07:42:56 -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
teor 9daf06d171 comment: circuit_list_path_impl() does not check Named any more 2018-11-14 18:06:14 +10:00
teor a7aa3f76ec comment: Fix a typo in nodes_in_same_family() 2018-11-14 18:06:05 +10:00
teor c793cf338b doc: Remove an outdated sentence from KeepalivePeriod in the man page 2018-11-14 18:05:56 +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 7f042cbc0a Merge branch 'bug28413_029' into maint-0.2.9 2018-11-13 08:26:51 -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 1fce9d1296 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-11-11 18:05:45 -05:00
Nick Mathewson c97c2c690e Merge branch 'maint-0.3.5' into release-0.3.5 2018-11-11 18:05:45 -05:00
Nick Mathewson 896d0ebb99 Merge branch 'maint-0.3.4' into maint-0.3.5 2018-11-11 18:05:45 -05:00
Nick Mathewson 93b6d41374 Merge branch 'maint-0.2.9' into maint-0.3.3 2018-11-11 18:05:45 -05:00
Nick Mathewson 46796623f9 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
 2018-11-11 18:03:50 -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