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
34,093 Commits 53 Branches 631 Tags
3864536b7c19ad628df4b2f4d492ef4adc0f536c
Commit Graph

8814 Commits

Author SHA1 Message Date
teor e466c84ed3 Merge branch 'maint-0.4.2' 2019-11-07 10:51:48 +10:00
teor 1f3bf10d3f Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.4.2 2019-11-07 10:51:22 +10:00
Nick Mathewson 4d70e725d1 Do not try to shut down the event loop when it is not initialized. 
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-06 11:33:23 -05:00
David Goulet 65013a6924 changes: Add file for ticket #31371 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-11-06 10:27:34 -05:00
Nick Mathewson 059a5795d3 Merge branch 'maint-0.4.2' 2019-11-06 08:57:21 -05:00
Nick Mathewson 8f6dc54e3c Merge remote-tracking branch 'tor-github/pr/1495' into maint-0.4.2 2019-11-06 08:57:14 -05:00
teor 22482fd454 test/parseconf: Add support for optional library variants 
test_parseconf.sh now supports:
* {error,expected}{,_lzma,_nss,_zstd}{,_no_dirauth,_no_relay_dirauth}
Or any combination of two or more optional libraries.

Closes ticket 32397.
 2019-11-06 21:36:42 +10:00
teor 89f52f36e0 Merge remote-tracking branch 'tor-github/pr/1510' 2019-11-06 21:29:18 +10:00
teor c3a1e15a5e Merge remote-tracking branch 'tor-github/pr/1509' into maint-0.4.2 2019-11-06 21:28:28 +10:00
teor 23ff60c150 Merge branch 'maint-0.4.2' 2019-11-06 17:04:52 +10:00
teor f7b45975bf Merge branch 'bug32402_042' into bug32402_master 
Merge changes from master with shellcheck fixes.
 2019-11-06 16:14:06 +10:00
teor 7f23d47f72 shellcheck: Fix issues in the git-*.sh scripts 
Fixes bug 32402; bugfix on 0.4.2.1-alpha.
Obviously correct changes to already reviewed code.
 2019-11-06 16:09:31 +10:00
teor 57baea701f shellcheck: Start checking most scripts for errors 
This check was accidentally disabled by a bad find command.

Fixes bug 32402; bugfix on 0.4.2.1-alpha.
Obviously correct changes to already reviewed code.
 2019-11-06 15:49:50 +10:00
teor 10ef7a31cf Makefile: Fix "make check-includes" for out-of-tree builds 
Previously, it would run on the build tree, which did not contain
any sources.

Fixes bug 31335; bugfix on 0.3.5.1-alpha.
 2019-11-06 12:30:19 +10:00
teor 1bde356bf6 Merge branch 'maint-0.2.9' into maint-0.3.5 2019-11-06 11:19:30 +10:00
teor 4abfcb7997 Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5 2019-11-06 11:18:09 +10:00
teor 0e2834a371 Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5 2019-11-06 11:17:43 +10:00
teor d2e4262ebc Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5 2019-11-06 11:17:01 +10:00
teor 6bfdd09679 Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5 2019-11-06 11:16:09 +10:00
teor 0650bf3695 Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9 2019-11-06 11:15:45 +10:00
teor c06d540ff9 Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9 2019-11-06 11:14:53 +10:00
teor 804d7c9bfc configure: Remove a check that will always fail 
And update the changes file to be more specific.

Part of 32191.
 2019-11-05 15:48:01 +10:00
Hans-Christoph Steiner 2a349006b9 force pkg-config to only use --prefix when cross-compiling 
The current pkg-config setup has no sense of whether it is cross-compiling,
so it will detect things on the build system that are not present or are
wrong for the host system.  This forces the cross-compiling build to only
look for pkg-config .pc files in --prefix.

A version of this has been the setup for many years with the Android builds.

Fixes #32191

Signed-off-by: Hans-Christoph Steiner <hans@eds.org>
 2019-11-05 15:45:25 +10:00
teor 655603c779 Merge remote-tracking branch 'tor-github/pr/1487' 
Combine V_IMMUTABLE and FILENAME changes on PidFile.
 2019-11-05 14:26:23 +10:00
teor b9269d6d0a Merge remote-tracking branch 'tor-github/pr/1486' 2019-11-05 14:23:56 +10:00
teor 6169469546 Merge remote-tracking branch 'tor-github/pr/1477' 2019-11-05 14:23:10 +10:00
teor 81972353cb scripts: Fix update_versions.py for out-of-tree builds 
Fixes bug 32371; bugfix on 0.4.0.1-alpha.
 2019-11-05 12:00:59 +10:00
teor 9e2a2d38f4 Makefile: Fix "make autostyle" for out-of-tree builds 
Fixes bug 32370; bugfix on 0.4.1.2-alpha.
 2019-11-05 12:00:57 +10:00
teor 96334d6f7f changes: file for 32213 2019-11-05 11:26:26 +10:00
teor 233b96d83a test/parseconf: Always show the result file name on failure 
Obviously correct fixes on already reviewed code.
 2019-11-05 11:12:50 +10:00
teor 5b04db59f6 test/scripts: Use the same code to find the tor binary 
This change makes sure we are always using the coverage binary, when
coverage is enabled.

Fixes bug 32368; bugfix on 0.2.7.3-rc.
 2019-11-05 11:07:31 +10:00
teor f29de4b8d2 confmgt: Stop adding a space, when there is no option value 
Fixes bug 32352; bugfix on 0.0.9pre6.
 2019-11-05 11:01:28 +10:00
Nick Mathewson 096cbfb8b0 Merge remote-tracking branch 'tor-github/pr/1480' 2019-11-01 09:35:17 -04:00
George Kadianakis fa0257eda0 Merge branch 'tor-github/pr/1484' 2019-10-31 15:31:14 +08:00
Nick Mathewson 14831ea0ab Use FILENAME to determine which options to check for relative paths 
This is part of ticket 32344.
 2019-10-30 15:32:12 -04:00
Nick Mathewson b985cf2403 Use CFLG_IMMUTABLE to replace much of the options transition cb. 
Closes ticket 32344.
 2019-10-30 15:05:26 -04:00
David Goulet f579541f13 Merge branch 'tor-github/pr/1468' 2019-10-30 08:53:51 -04:00
Neel Chauhan f81e4aa831 hs-v2: Lookup intro failure cache when picking an intro from descriptor 
When picking an intro point from the service descriptor, the client failed to
lookup the failure cache.

It made an HS v2 client re-pick bad intro points for which we already know it
won't work in the first place.

Based on Neel Chauhan original patch.

Fixes #25568

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-10-30 08:47:21 -04:00
Taylor Yu 1e8ddbe1ee Changes file for ticket 32277 2019-10-29 16:39:03 -05:00
George Kadianakis 4413b98190 Merge branch 'tor-github/pr/1456' 2019-10-29 21:29:13 +08:00
teor b448f6044d Merge branch 'maint-0.4.2' 2019-10-29 08:27:02 +10:00
teor 2395800d3e Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-29 08:26:55 +10:00
teor 63aff4a43e Merge branch 'maint-0.4.0' into maint-0.4.1 2019-10-29 08:26:48 +10:00
teor 54e2d0dc2d Merge branch 'maint-0.3.5' into maint-0.4.0 2019-10-29 08:26:40 +10:00
teor 15d67842f9 Merge branch 'maint-0.2.9' into maint-0.3.5 2019-10-29 08:26:32 +10:00
teor 752c35ca96 Merge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9 2019-10-29 08:23:35 +10:00
David Goulet d67db64ced changes: Add file for ticket 32196 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-10-28 13:21:08 -04:00
David Goulet b98631d280 Merge branch 'tor-github/pr/1476' 2019-10-28 08:47:57 -04:00
Nick Mathewson bc4b9d7df4 Changes file for ticket 32307. 2019-10-26 12:09:09 -04:00
Nick Mathewson 731464deb5 changes file for 32304 2019-10-26 10:14:05 -04:00