ad9bcbfc87
update changelog for new geoip entry.
2019-12-06 16:06:01 -05:00
8646b4dde7
Merge branch 'maint-0.4.2' into release-0.4.2
2019-12-06 16:02:08 -05:00
3248630fc8
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-12-06 16:02:08 -05:00
6513102b9d
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-06 16:02:08 -05:00
c7ca3fc186
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-12-06 16:02:07 -05:00
74cae547e5
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-12-06 16:02:07 -05:00
b7b467d3af
Update geoip and geoip6 to the December 3 2019 database.
2019-12-06 11:50:35 +01:00
a0f80026d0
start on changelog for 0.4.2.5
2019-12-05 12:18:50 -05:00
cfa9cc34aa
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-05 10:14:01 +10:00
92fb099067
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-12-05 10:13:53 +10:00
46057ec5ae
Merge remote-tracking branch 'tor-github/pr/1424' into maint-0.4.0
2019-12-05 10:13:15 +10:00
aee966cb06
Merge remote-tracking branch 'tor-github/pr/1277' into maint-0.3.5
2019-12-05 10:11:18 +10:00
df9a1f3137
Merge branch 'maint-0.4.2' into release-0.4.2
2019-12-03 12:47:02 +10:00
3207a8e5c2
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-12-03 12:46:58 +10:00
14089a29b5
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-03 12:46:50 +10:00
febbc236d4
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-12-03 12:46:43 +10:00
145ff92d92
Merge branch 'maint-0.2.9' into maint-0.3.5
...
Merge C_DIALECT_OPTIONS from ticket32500_029 with
other configure options from maint-0.3.5.
2019-12-03 12:45:41 +10:00
792c15fde2
Travis: use -std=gnu99 in some jobs
...
Require C99 standards-conforming code in Travis CI, but allow GNU gcc
extensions. Also activates clang's -Wtypedef-redefinition warnings.
Builds some jobs with -std=gnu99, and some jobs without.
Closes ticket 32500.
2019-12-03 12:42:39 +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
Nick Mathewson
Karsten Loesing
teor