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
33,594 Commits 53 Branches 631 Tags
e5b9eefb02ddd951d3b959ebb5d2ca72ea65a9a9
Commit Graph

33594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson e5b9eefb02 Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-22 12:10:30 -04:00
Nick Mathewson 6965798a16 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-10-22 12:10:30 -04:00
Nick Mathewson 4013e50cb7 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-10-22 12:10:30 -04:00
Nick Mathewson 21c3488af7 Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5 2019-10-22 12:10:08 -04:00
Nick Mathewson cbc67241db Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-22 12:08:53 -04:00
Nick Mathewson 4c8af10f0e Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1 2019-10-22 12:08:46 -04:00
teor f98b59524c Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-22 20:48:20 +10:00
teor 2318bb237f Merge branch 'maint-0.4.0' into maint-0.4.1 2019-10-22 20:48:13 +10:00
teor 9bb0ca122f Merge branch 'maint-0.3.5' into maint-0.4.0 2019-10-22 20:48:05 +10:00
teor bed4390133 Merge remote-tracking branch 'origin/maint-0.3.5' into maint-0.3.5 2019-10-22 20:47:44 +10:00
teor 8f84999f58 Merge branch 'ticket32177_041' into ticket32177_042 
Merge RUST_VERSION from maint-0.4.2 into disabled macOS rust build
from ticket32177_041.
 2019-10-22 19:44:58 +10:00
teor 86b1714731 Merge branch 'ticket32177_040' into ticket32177_041 2019-10-22 19:43:38 +10:00
teor 868bcc24e5 Merge branch 'ticket32177_035' into ticket32177_040 2019-10-22 19:43:33 +10:00
teor 8e0190d837 Merge branch 'maint-0.3.5' into ticket32177_035 2019-10-22 19:43:18 +10:00
teor 4c4a0d50ff Travis: Disable the Rust macOS build 
This build was added in 0.3.5.

We need to mitigate slow scheduling of Travis macOS jobs.

Closes ticket 32177.
 2019-10-22 19:42:45 +10:00
teor 92ad87b808 Merge branch 'ticket32177_029' into ticket32177_035 
Stem from maint-0.3.5, disabled macOS chutney from ticket32177_029.
 2019-10-22 19:42:23 +10:00
teor 511aeba8ee Travis: Disable all but one macOS build 
We need to mitigate slow scheduling of Travis macOS jobs.

Closes ticket 32177.
 2019-10-22 19:35:43 +10:00
Nick Mathewson 53aa159632 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-10-21 18:44:44 -04:00
Nick Mathewson 89ead08eef Merge branch 'maint-0.3.5' into maint-0.4.0 2019-10-21 18:44:44 -04:00
Nick Mathewson 7a35c8d8be Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-21 18:44:44 -04:00
teor 04e9e74f1d Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.4.2 2019-10-21 13:07:39 +10:00
teor 5dbdca0114 Merge remote-tracking branch 'tor-github/pr/1432' into maint-0.4.2 2019-10-21 09:45:18 +10:00
teor 5c8ecf364a Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.4.2 2019-10-21 09:44:42 +10:00
teor 02e3e8eda5 hibernate: Fix repeated "bytes" in comment 2019-10-20 22:08:23 +10:00
teor f420b60c19 Appveyor: Use Windows Server 2019 
Instead of Windows Server 2016.

Closes ticket 32086.
 2019-10-20 22:04:08 +10:00
teor cf2b00d3f5 test/rebind: Make control formatting and log parsing more robust 
* actually sleep when tor has not logged anything
* log at debug level when waiting for tor to log something
* backslash-replace bad UTF-8 characters in logs
* format control messages as ASCII: tor does not accept UTF-8 control commands

Fixes bug 31837; bugfix on 0.3.5.1-alpha.
 2019-10-20 20:09:35 +10:00
teor 0a5ce8280c err: Use the correct type for cb_buf 
Fixes bug 32060; bug not in any released version of tor.

Resolves CID 1454761.
 2019-10-20 20:01:56 +10:00
Roger Dingledine 8b4d7447ae fix easy typos 2019-10-20 05:52:32 -04:00
Nick Mathewson f0f3f3338e Merge remote-tracking branch 'tor-github/pr/1427' into maint-0.4.2 2019-10-18 12:42:49 -04:00
Nick Mathewson 0994050c4a Merge remote-tracking branch 'tor-github/pr/1426' into maint-0.4.2 2019-10-18 12:32:29 -04:00
Nick Mathewson 57c4af16f0 Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.2 2019-10-18 12:27:39 -04:00
Nick Mathewson fbd2fef220 Merge branch 'maint-0.4.2' of git-rw.torproject.org:/tor into maint-0.4.2 2019-10-18 12:25:55 -04:00
teor b3fc3b609b changes: file for 32124. 2019-10-18 17:26:09 +10:00
teor ac71ad662c configure: Stop failing when jemalloc is requested, but tcmalloc is not found 
Fixes bug 32124; bugfix on 0.3.5.1-alpha.
 2019-10-18 17:18:52 +10:00
teor 4442eef0b3 configure: Interpret --with-tcmalloc=no correctly 
Fixes bug 32124; bugfix on 0.2.0.20-rc.
 2019-10-18 17:16:32 +10:00
teor f59c4a0940 configure: Interpret --disable-module-dirauth=no correctly 
Fixes bug 32134; bugfix on 0.3.4.1-alpha.
 2019-10-18 17:15:34 +10:00
teor 5ff99901d2 configure: Clarify the description of --disable-module-dirauth 
Part of 32123.
 2019-10-18 16:59:57 +10:00
teor f73c8bd786 Merge remote-tracking branch 'tor-github/pr/1407' into maint-0.4.2 2019-10-18 12:05:07 +10:00
Alexander Færøy 389b37246e Remove overly strict assertions in transports.c. 
This patch removes an overly strict tor_assert() and an ignorable BUG()
expression. Both of these would trigger if a PT was unable to configure
itself during startup. The easy way to trigger this is to configure an
obfs4 bridge where you make the obfs4 process try to bind on a port
number under 1024.

See: https://bugs.torproject.org/31091
 2019-10-17 21:33:54 +02:00
Alexander Færøy 95e3527df0 Bump practracker exception limit for process_win32_exec(). 
I have added a larger comment there and one line of code, so I think
this bump is reasonable.

See: https://bugs.torproject.org/31810
 2019-10-17 21:12:51 +02:00
Alexander Færøy 4ed06acb2a Add test to check if the exit callback is called in process_t upon process_exec() failures. 
This patch adds a test to check for whether the exit callback is always
called when process_exec() fails, both on Windows and Unix.

See: https://bugs.torproject.org/31810
 2019-10-17 20:52:32 +02:00
Alexander Færøy 7a64f6ea04 Ensure that the exit callback is called if CreateProcessA() fails on Windows. 
This patch fixes an issue where the exit handler is not called for the
given process_t in case CreateProcessA() fails. This could, for example,
happen if the user tries to execute a binary that does not exist.

See: https://bugs.torproject.org/31810
 2019-10-17 20:52:27 +02:00
Alexander Færøy 85b4a5c276 Handle errors from execve() in the Unix process backend more gracefully. 
This patch removes a call to tor_assert_unreached() after execve()
failed. This assertion leads to the child process emitting a stack trace
on its standard output, which makes the error harder for the user to
demystify, since they think it is an internal error in Tor instead of
"just" being a "no such file or directory" error.

The process will now instead output "Error from child process: X" where
X is the stringified version of the errno value.

See: https://bugs.torproject.org/31810
 2019-10-17 20:52:22 +02:00
David Goulet 4a8d491322 mainloop: Disable periodic events before a destroy 
When tearing down all periodic events during shutdown, disable them first so
their enable flag is updated.

This allows the tor_api.h to relaunch tor properly after a clean shutdown.

Fixes #32058

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-10-17 10:11:32 -04:00
teor 8ac9af2330 Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-17 14:52:15 +10:00
teor 400e31ad19 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-10-17 14:52:06 +10:00
teor e483257e1b Merge branch 'maint-0.3.5' into maint-0.4.0 2019-10-17 14:51:58 +10:00
teor 4b8e5ea0dc Merge branch 'maint-0.2.9' into maint-0.3.5 2019-10-17 14:51:50 +10:00
teor 92c4dc9b14 Merge remote-tracking branch 'tor-github/pr/1373' into maint-0.4.2 2019-10-17 14:51:30 +10:00
teor 13daf339a9 Merge remote-tracking branch 'tor-github/pr/1372' into maint-0.4.1 2019-10-17 14:51:02 +10:00