Nick Mathewson
2e80d38dcd
Merge branch 'maint-0.3.5' into release-0.3.5
2020-03-17 15:22:35 -04:00
Nick Mathewson
fe3d8ec38e
Merge branch 'trove_2020_002_035' into maint-0.3.5
2020-03-17 15:21:48 -04:00
Nick Mathewson
261bf5f863
Initial changelog for 0.3.5.10
2020-03-17 15:00:13 -04:00
Nick Mathewson
0d5b20d2aa
Merge branch 'maint-0.3.5' into release-0.3.5
2020-03-17 11:45:16 -04:00
George Kadianakis
089e57d22f
Fix TROVE-2020-003.
...
Given that ed25519 public key validity checks are usually not needed
and (so far) they are only necessary for onion addesses in the Tor
protocol, we decided to fix this specific bug instance without
modifying the rest of the codebase (see below for other fix
approaches).
In our minimal fix we check that the pubkey in
hs_service_add_ephemeral() is valid and error out otherwise.
2020-03-17 11:44:45 -04:00
teor
75873c1a30
Merge branch 'maint-0.3.5' into release-0.3.5
2020-03-16 20:54:16 +10:00
teor
1c688ba925
Travis: Produce detailed chutney diagnostics
...
When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool
to produce detailed diagnostic output.
Closes ticket 32792.
2020-03-16 16:04:51 +10:00
Nick Mathewson
8fef85306e
Merge branch 'maint-0.3.5' into release-0.3.5
2020-03-13 16:46:16 -04:00
Nick Mathewson
b9d71f3848
Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5
2020-03-13 16:46:09 -04:00
teor
47e0ac3561
Merge branch 'maint-0.3.5' into release-0.3.5
2020-03-13 13:01:14 +10:00
teor
add387c507
Travis: Sort jobs in order of speed
...
Putting the slowest jobs first takes full advantage of Travis
concurrency.
Closes 33194.
2020-02-13 13:52:41 +10:00
teor
fc3555100f
Travis: Remove a redundant distcheck job
...
Part of 33194.
2020-02-13 13:45:18 +10:00
teor
03650e0f60
Travis: Require the macOS IPv6 chutney job
...
The job was previously set to fast_finish / allow_failure, to
speed up the build.
Closes ticket 33195.
2020-02-13 13:43:59 +10:00
teor
d8cef680fc
Merge branch 'maint-0.3.5' into release-0.3.5
2020-02-12 12:21:53 +10:00
Alexander Færøy
b9c7c61ea5
Lowercase the BridgeDistribution value from torrc in descriptors.
...
This patch ensures that we always lowercase the BridgeDistribution from
torrc in descriptors before submitting it.
See: https://bugs.torproject.org/32753
2020-02-12 12:21:41 +10:00
teor
88723ad169
Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5
2020-02-12 12:18:59 +10:00
Nick Mathewson
ec454830e7
Merge branch 'maint-0.3.5' into release-0.3.5
2020-02-10 14:17:09 -05:00
Nick Mathewson
99d044d553
Fix a Rust compilation warning; resolve bug 33212.
2020-02-10 13:32:09 -05:00
Nick Mathewson
d0bce65ce2
changes file for 33119 aka TROVE-2020-002
2020-02-05 12:02:32 -05:00
teor
c3e300dc9c
Merge branch 'maint-0.3.5' into release-0.3.5
2020-01-30 07:54:54 +10:00
teor
41d52e9cd8
Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5
2020-01-30 07:53:53 +10:00
Nick Mathewson
1f163fcbde
Change BUG() messages in buf_flush_to_tls() to IF_BUG_ONCE()
...
We introduced these BUG() checks in b0ddaac074 to prevent a
recurrence of bug 23690. But there's a report of the BUG() message
getting triggered and filling up the disk. Let's change it to
IF_BUG_ONCE().
Fixes bug 33093; bugfix on 0.3.2.2-alpha.
2020-01-29 08:31:22 -05:00
teor
9d771ccc86
Travis: Stop allowing stem test failures
...
Stop allowing failures on the Travis CI stem tests job. It looks like
all the stem hangs we were seeing are now fixed, but let's make sure we
see them if they happen again.
Closes ticket 33075.
2020-01-28 19:56:56 +10:00
teor
792172ffec
Merge branch 'maint-0.3.5' into release-0.3.5
2020-01-16 10:00:28 +10:00
teor
19954cffd7
Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5
2020-01-16 09:57:27 +10:00
teor
23e1c1c35c
Merge branch 'maint-0.3.5' into release-0.3.5
2019-12-20 10:12:35 +10:00
Peter Gerber
0d64bafcfe
Correct how we use libseccomp
...
This fixes a startup crash with libseccomp v2.4.0 if Sandbox is
set to 1.
2019-12-17 09:47:28 -05:00
teor
0b3763612c
Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035
2019-12-16 09:21:05 +10:00
teor
75096de4c7
Merge branch 'bug32240_029' into bug32240_035
...
Merge
* Chutney Trusty deletion in bug32240_029
* NSS addition in maint-0.3.5
2019-12-16 09:09:16 +10:00
teor
37b04aeed7
changes: file for 32240
2019-12-16 09:06:25 +10:00
teor
28e708fcbc
Merge branch 'maint-0.3.5' into release-0.3.5
2019-12-16 08:16:00 +10:00
teor
05908d57f6
Merge remote-tracking branch 'tor-github/pr/1576' into maint-0.3.5
2019-12-16 08:14:04 +10:00
teor
7dd5946094
Merge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9
2019-12-16 08:13:38 +10:00
Nick Mathewson
e0920a3f63
changelog: new geoip entry.
2019-12-06 16:04:19 -05:00
Nick Mathewson
74cae547e5
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-12-06 16:02:07 -05:00
Nick Mathewson
289adbce58
Merge branch 'maint-0.3.5' into release-0.3.5
2019-12-06 16:02:07 -05:00
Karsten Loesing
b7b467d3af
Update geoip and geoip6 to the December 3 2019 database.
2019-12-06 11:50:35 +01:00
teor
a277f28947
changes: file for 32629
2019-12-06 10:51:43 +10:00
teor
b84e7715da
changes: file for 32629
2019-12-06 10:51:05 +10:00
Nick Mathewson
0844460589
Start a changelog for 0.3.5.9
2019-12-05 13:18:15 -05:00
teor
c64844243a
Merge branch 'maint-0.3.5' into release-0.3.5
2019-12-05 10:13:49 +10:00
teor
aee966cb06
Merge remote-tracking branch 'tor-github/pr/1277' into maint-0.3.5
2019-12-05 10:11:18 +10:00
teor
4ded6981be
Merge branch 'maint-0.3.5' into release-0.3.5
2019-12-03 12:46:39 +10:00
teor
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
teor
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
teor
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
teor
99b5f1b261
Revert "Travis: Disable all but one macOS build"
...
This reverts commit 511aeba8ee .
2019-11-28 12:10:10 +10:00
teor
90b8c21671
Merge branch 'maint-0.3.5' into release-0.3.5
2019-11-25 12:36:53 +10:00
teor
501b5174d8
Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5
2019-11-25 12:35:11 +10:00
teor
400cee261e
Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.3.5
2019-11-25 12:34:29 +10:00