f2f7491cd9
Merge branch 'ticket32629_029' into ticket32629_035
...
Merge re-enable chutney from ticket32629_029 with
stem from maint-0.3.5.
2019-11-28 12:21:08 +10:00
99b5f1b261
Revert "Travis: Disable all but one macOS build"
...
This reverts commit 511aeba8ee
2019-11-28 12:10:10 +10:00
26071aa3be
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-11-25 12:37:07 +10:00
055f5d4d1b
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-11-25 12:36:59 +10:00
c17ab20ac0
Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.0
2019-11-25 12:36:41 +10:00
ed6f2f61a2
Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.0
2019-11-25 12:35:58 +10:00
501b5174d8
Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5
2019-11-25 12:35:11 +10:00
400cee261e
Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.3.5
2019-11-25 12:34:29 +10:00
54c01119ed
Merge remote-tracking branch 'tor-github/pr/1405' into maint-0.3.5
2019-11-25 12:33:55 +10:00
83424cb62f
Merge remote-tracking branch 'tor-github/pr/1395' into maint-0.3.5
2019-11-25 12:33:14 +10:00
f9812ee5f7
Merge remote-tracking branch 'tor-github/pr/1394' into maint-0.3.5
2019-11-25 12:29:43 +10:00
1d969af11b
start changelog for 0.4.2.4-rc.
2019-11-12 16:42:31 -05:00
0cfb7f6ce7
Merge branch 'maint-0.4.2' into release-0.4.2
2019-11-12 10:09:57 +10:00
2ee04fc309
config: Log the option name when skipping an obsolete option
...
This is a basic fix for 0.4.2 only. The fix for 0.4.3 and later
is in 32404.
Fixes bug 32295; bugfix on 0.4.2.1-alpha.
2019-11-12 10:07:12 +10:00
29eb7b07ef
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-11-11 10:14:04 -05:00
111f988b5c
Merge branch 'maint-0.4.2' into release-0.4.2
2019-11-11 10:14:04 -05:00
a920597f62
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-11-11 10:14:04 -05:00
329aa1c48e
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-11-11 10:14:03 -05:00
7beaaed245
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-11-11 10:14:03 -05:00
253a45115e
Merge branch 'maint-0.4.2' into release-0.4.2
2019-11-11 14:19:59 +10:00
8b1f99c29d
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-11-11 14:19:55 +10:00
7043be968a
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-11-11 14:19:47 +10:00
29940511e3
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-11-11 14:19:39 +10:00
2abff832dd
Appveyor: Install OpenSSL to resolve a header/library mismatch
...
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-11 13:19:15 +10:00
853b6ad095
Update geoip and geoip6 to the November 6 2019 database.
2019-11-09 10:10:19 +01:00
7a4069911d
Merge branch 'maint-0.4.2' into release-0.4.2
2019-11-07 10:51:43 +10:00
1f3bf10d3f
Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.4.2
2019-11-07 10:51:22 +10:00
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
634fdf86ff
Merge branch 'maint-0.4.2' into release-0.4.2
2019-11-06 08:57:21 -05:00
8f6dc54e3c
Merge remote-tracking branch 'tor-github/pr/1495' into maint-0.4.2
2019-11-06 08:57:14 -05:00
3d7433cd97
Merge branch 'maint-0.4.2' into release-0.4.2
2019-11-06 21:30:39 +10:00
c3a1e15a5e
Merge remote-tracking branch 'tor-github/pr/1509' into maint-0.4.2
2019-11-06 21:28:28 +10:00
cf56693f1c
Merge branch 'maint-0.4.2' into release-0.4.2
2019-11-06 17:04:48 +10:00
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
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
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
de6ceb0bee
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-11-06 11:19:46 +10:00
03e77ef036
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-11-06 11:19:38 +10:00
1bde356bf6
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-11-06 11:19:30 +10:00
4f9a003392
Merge remote-tracking branch 'tor-github/pr/1374' into maint-0.4.1
2019-11-06 11:19:13 +10:00
4abfcb7997
Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5
2019-11-06 11:18:09 +10:00
0e2834a371
Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5
2019-11-06 11:17:43 +10:00
d2e4262ebc
Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5
2019-11-06 11:17:01 +10:00
6bfdd09679
Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5
2019-11-06 11:16:09 +10:00
0650bf3695
Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9
2019-11-06 11:15:45 +10:00
c06d540ff9
Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9
2019-11-06 11:14:53 +10:00
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
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
dbae58d580
Merge branch 'maint-0.4.2' into release-0.4.2
2019-10-29 08:26:59 +10:00
2395800d3e
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-29 08:26:55 +10:00
teor
Nick Mathewson
Karsten Loesing
Hans-Christoph Steiner