a00b9e5a86
Merge branch 'ticket32629_040' into ticket32629_041
2019-12-01 20:26:55 +10:00
349554f40d
Merge branch 'ticket32629_035' into ticket32629_040
2019-12-01 20:26:51 +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
189287e7bc
Merge branch 'maint-0.4.2' into release-0.4.2
2019-11-25 12:50:59 +10:00
eb81704081
CodingStandards: Use consistent spacing
...
* 2 newlines before ====== headers
* 1 newline before ------ headers
2019-11-25 12:50:15 +10:00
aa73b30dfa
Merge branch 'maint-0.4.2' into release-0.4.2
2019-11-25 12:37:21 +10:00
3d6545250e
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-11-25 12:37:15 +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
969ee5d77f
CodingStandards: Use the correct changes file format
...
And remove a duplicate description of the format.
Obviously correct changes to documentation.
2019-11-25 11:44:22 +10:00
7f43d24e07
Merge branch 'maint-0.4.2' into release-0.4.2
2019-11-15 08:06:50 -05:00
6d81ca845c
bump version to 0.4.2.4-rc-dev
2019-11-15 08:06:09 -05:00
6a490d3032
pick a release date.
2019-11-15 07:25:12 -05:00
086b81cb08
more blurb for 0.4.2.4-rc changelog.
2019-11-12 16:46:54 -05:00
e3e25c09b7
Minor edits and sorting on 0.4.2.4-rc changelog
2019-11-12 16:46:14 -05:00
1d969af11b
start changelog for 0.4.2.4-rc.
2019-11-12 16:42:31 -05:00
9eef1d680c
Merge branch 'maint-0.4.2' into release-0.4.2
2019-11-12 16:40:00 -05:00
70755eca00
Bump version to 0.4.2.4-rc.
2019-11-12 16:39:37 -05:00
0cfb7f6ce7
Merge branch 'maint-0.4.2' into release-0.4.2
2019-11-12 10:09:57 +10:00
9be51e8a8e
test/parseconf: Add tests for ignored options
...
These tests will also pass on 0.4.3, with the original implementation,
and with the new implementation in 32404.
Part of 32295 and 32404.
2019-11-12 10:09:40 +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
teor
Nick Mathewson
Karsten Loesing