c4eb6740f9
Merge branch 'maint-0.4.0' into release-0.4.0
2019-12-16 08:16:08 +10:00
7481172983
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-12-16 08:16:04 +10:00
05908d57f6
Merge remote-tracking branch 'tor-github/pr/1576' into maint-0.3.5
2019-12-16 08:14:04 +10:00
6f615ee205
update changelog for new geoip entry.
2019-12-06 16:05:47 -05:00
4de31504b0
Merge branch 'maint-0.4.0' into release-0.4.0
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
a277f28947
changes: file for 32629
2019-12-06 10:51:43 +10:00
948e9bf6c1
Start a changelog for 0.4.0.6
2019-12-05 12:50:18 -05:00
aa47cb6e0f
Merge branch 'maint-0.4.0' into release-0.4.0
2019-12-05 10:13:57 +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
03dc0e19a1
Merge branch 'maint-0.4.0' into release-0.4.0
2019-12-03 12:46:47 +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
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
c88fce1323
Merge branch 'maint-0.4.0' into release-0.4.0
2019-11-25 12:37:03 +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
76177368c9
Merge branch 'maint-0.4.0' into release-0.4.0
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
c0543ac327
Merge branch 'maint-0.4.0' into release-0.4.0
2019-11-11 14:19:43 +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
e241523195
Merge branch 'maint-0.4.0' into release-0.4.0
2019-11-06 11:19:42 +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
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
ff601da0d1
Merge branch 'maint-0.4.0' into release-0.4.0
2019-10-29 08:26:44 +10:00
54e2d0dc2d
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-29 08:26:40 +10:00
15d67842f9
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-29 08:26:32 +10:00
752c35ca96
Merge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9
2019-10-29 08:23:35 +10:00
d945a88945
Merge branch 'maint-0.4.0' into release-0.4.0
2019-10-25 10:56:02 +10:00
teor
Nick Mathewson
Karsten Loesing