aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-11Merge branch 'maint-0.2.9' into maint-0.3.5Nick Mathewson
2019-11-11Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-11-11Appveyor: Install OpenSSL to resolve a header/library mismatchteor
Install the mingw OpenSSL package in Appveyor. This makes sure that the OpenSSL headers and libraries match in Tor's Appveyor builds. (This bug was triggered by an Appveyor image update.) Fixes bug 32449; bugfix on 0.3.5.6-rc.
2019-11-09Update geoip and geoip6 to the November 6 2019 database.Karsten Loesing
2019-11-06Do not try to shut down the event loop when it is not initialized.Nick Mathewson
Doing so caused us to crash in some unusual circumstances, such as using --verify-config to verify a configuration that failed during the options_act() stage. Fixes bug 32407; bugfix on 0.3.3.1-alpha.
2019-11-06Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-11-06Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9teor
2019-10-29Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-10-29Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-10-29Merge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9teor
2019-10-25Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-10-25Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-10-25changes: file for 31919's bionic Travis image changeteor
2019-10-25Merge branch 'ticket31919_bionic_029' into ticket31919_bionic_035teor
2019-10-25Travis: Use Ubuntu Bionic, but keep Trusty for chutneyteor
Bionic has a recent coccinelle version, which passes our CI tests. But Bionic (and Xenial) cause permissions errors for chutney. We'll fix those in 32240. Part of 31919.
2019-10-24hs-v3: Remove a BUG() caused by an acceptable raceDavid Goulet
hs_client_purge_state() and hs_cache_clean_as_client() can remove a descriptor from the client cache with a NEWNYM or simply when the descriptor expires. Which means that for an INTRO circuit being established during that time, once it opens, we lookup the descriptor to get the IP object but hey surprised, no more descriptor. The approach here is minimalist that is accept the race and close the circuit since we can not continue. Before that, the circuit would stay opened and the client wait the SockTimeout. Fixers #28970. Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-24Travis: Use macOS 10.14 with Xcode 11.2teor
Closes ticket 32241.
2019-10-24Travis: Use zstd in our Travis Linux buildsteor
Recent Ubuntu versions have zstd >= 1.1, which is an optional tor build dependency. Closes ticket 32242.
2019-10-23Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-10-23Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5teor
2019-10-23Merge branch 'maint-0.2.9' into maint-0.3.5teor
`git merge --strategy ours` to take the 0.3.5 changes for 31001, and ignore the conflicting 0.2.9 changes.
2019-10-23Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9teor
2019-10-22Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5Nick Mathewson
2019-10-22Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-10-22Merge remote-tracking branch 'origin/maint-0.3.5' into maint-0.3.5teor
2019-10-22Travis: Disable the Rust macOS buildteor
This build was added in 0.3.5. We need to mitigate slow scheduling of Travis macOS jobs. Closes ticket 32177.
2019-10-22Merge branch 'ticket32177_029' into ticket32177_035teor
Stem from maint-0.3.5, disabled macOS chutney from ticket32177_029.
2019-10-22Travis: Disable all but one macOS buildteor
We need to mitigate slow scheduling of Travis macOS jobs. Closes ticket 32177.
2019-10-21Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-10-21respect accountingmax during soft hibernationRoger Dingledine
Relays now respect their AccountingMax bandwidth again. When relays entered "soft" hibernation (which typically starts when we've hit 90% of our AccountingMax), we had stopped checking whether we should enter hard hibernation. Soft hibernation refuses new connections and new circuits, but the existing circuits can continue, meaning that relays could have exceeded their configured AccountingMax. This commit rolls back some of the cpu-saving fixes, where we tried to avoid calling so many of our events while we're off the network. That's because PERIODIC_EVENT_FLAG_NEED_NET checks net_is_disabled(), which returns true even if we're only in soft hibernation. Fixes bug 32108; bugfix on 0.4.0.1-alpha.
2019-10-20Appveyor: Use Windows Server 2019teor
Instead of Windows Server 2016. Closes ticket 32086.
2019-10-20test/rebind: Make control formatting and log parsing more robustteor
* 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-17Remove overly strict assertions in transports.c.Alexander Færøy
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-17Add test to check if the exit callback is called in process_t upon ↵Alexander Færøy
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-17Ensure that the exit callback is called if CreateProcessA() fails on Windows.Alexander Færøy
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-17Handle errors from execve() in the Unix process backend more gracefully.Alexander Færøy
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-17mainloop: Disable periodic events before a destroyDavid Goulet
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-17Merge branch 'maint-0.3.5' into maint-0.4.0teor