ffccf6fc55
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-16 08:16:12 +10:00
7481172983
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-12-16 08:16:04 +10:00
1cd20ff848
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-12-16 08:15:55 +10:00
05908d57f6
Merge remote-tracking branch 'tor-github/pr/1576' into maint-0.3.5
2019-12-16 08:14:04 +10:00
7dd5946094
Merge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9
2019-12-16 08:13:38 +10:00
7174a80edd
bump to 0.4.1.7-dev
2019-12-09 16:02:36 -05:00
7aaf714e8e
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-09 16:02:07 -05:00
b9504f788c
Bump version to 0.4.0.6-dev
2019-12-09 16:01:56 -05:00
651d29c0f7
Merge branch 'maint-0.3.5' into maint-0.4.0
...
"ours" to avoid version bump.
2019-12-09 16:01:22 -05:00
0c4f0ec977
bump to 0.3.5.9-dev
2019-12-09 16:01:11 -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
a277f28947
changes: file for 32629
2019-12-06 10:51:43 +10:00
b84e7715da
changes: file for 32629
2019-12-06 10:51:05 +10:00
8933c7908d
bump version to 0.4.1.7
2019-12-05 13:31:46 -05:00
db1065403d
Merge branch 'maint-0.4.0' into maint-0.4.1
...
"ours" to avoid version bump.
2019-12-05 13:31:17 -05:00
e66533befa
Bump to 0.4.0.6
2019-12-05 13:31:01 -05:00
371d7dbc1a
Merge branch 'maint-0.3.5' into maint-0.4.0
...
"ours" to avoid version bump.
2019-12-05 13:30:32 -05:00
c53567c36f
Bump version to 0.3.5.9
2019-12-05 13:29:49 -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
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
62cf12a8bd
Travis: use -std=gnu99 with NSS, and clang with Chutney
...
NSS:
* test NSS-specific code with -std=gnu99
* use a recent gcc version from the latest Ubuntu image
Chutney:
* use clang, so we keep one clang Linux job
* keep clang on a fast job, so the overall build finishes quickly
Closes ticket 32500 for 0.3.5.
2019-12-03 12:46:22 +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
6558bb4460
Travis: Disable the macOS Rust job
...
This time, we're disabling it because it's the lowest priority job.
(And also slow.)
Part of 32629.
2019-12-01 20:25:00 +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
453e092e52
Revert "Travis: Disable the Rust macOS build"
...
This reverts commit 4c4a0d50ff
2019-11-28 12:11:37 +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
29eb7b07ef
Merge branch 'maint-0.4.0' into maint-0.4.1
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
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
teor
Nick Mathewson
Karsten Loesing