David Goulet
88a8deb420
Merge branch 'tor-github/pr/1236'
2019-08-29 12:58:25 -04:00
Nick Mathewson
f1707f7db3
Merge branch 'maint-0.4.1'
2019-08-24 16:29:23 -04:00
teor
7c92f4faa2
Merge branch 'bug31463_040' into bug31463_041
2019-08-22 22:10:06 +10:00
teor
8b32d22a07
Merge branch 'bug31463_035' into bug31463_040
2019-08-22 22:10:00 +10:00
Sebastian Hahn
190386f1c4
Fix gcc build exclude on travis
...
The main build doesn't use HARDENING_OPTIONS, so the exclude shouldn't,
either. Reduces the number of builders by one.
2019-08-22 22:09:32 +10:00
Sebastian Hahn
360a29e282
Rust: Update version requirements and CI
...
The #[global_allocator] attribute is not available in versions prior to
1.28.0, the default-linker-libraries feature requires rust 1.31.0.
Adapt the CI to prevent accidental increases in Rust version by testing
against 1.31.0, beta and nightly.
2019-08-20 07:16:46 +02:00
teor
0acfd7dcee
Merge branch 'maint-0.4.1'
2019-08-08 11:20:07 +10:00
teor
40d7f1e3a6
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-08-08 11:19:58 +10:00
teor
0a661cde1d
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-08 11:19:38 +10:00
teor
e83eabc9bf
Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5
...
Merge changed chutney and stem script lines from 29280 with changed
stem script lines from 30591.
2019-08-08 11:17:46 +10:00
David Goulet
f7dc920f4b
Merge branch 'maint-0.4.1'
2019-07-23 09:39:51 -04:00
teor
7541aaf988
Merge branch 'chutney_ci_v4_040' into chutney_ci_v4_041
2019-07-01 14:36:53 +10:00
teor
7b05f19801
Merge branch 'chutney_ci_v4_035' into chutney_ci_v4_040
...
This merge removes an incorrect comment about the stem version
and commit script.
2019-07-01 14:36:15 +10:00
teor
6bc8dedbed
Travis: SKIP_MAKE_CHECK="yes" when running stem
...
And add some comments about stem
Part of 29280.
2019-07-01 14:33:54 +10:00
teor
84f2c0affb
Merge branch 'chutney_ci_v4_029' into chutney_ci_v4_035
2019-07-01 14:33:37 +10:00
teor
75f9ae9029
Travis: remove a redundant os: linux line
...
Linux is the first item in the os matrix, so we don't need to specify
it under matrix: include: .
Part of 29280.
2019-07-01 14:25:37 +10:00
teor
ac7ce17983
Travis: show the chutney commit and python version
...
Part of 29280.
2019-07-01 14:25:33 +10:00
teor
b26e3e4c56
Travis: show chutney logs on chutney job failure
...
Part of 29280.
2019-07-01 14:05:26 +10:00
teor
5fda190309
Travis: Log stem's TRACE logs to a file, and tail it on failure
...
Also filter out stem's SocketClosed logs, and fix some nearby comments.
Part of 30591.
2019-07-01 13:01:52 +10:00
rl1987
84f0f15066
Improve comment in .travis.yml
2019-06-23 14:12:05 +03:00
rl1987
f9de9052e1
On Travis, put random data in ~/.torrc
2019-06-23 13:31:47 +03:00
teor
1cad1f9804
Travis: Don't log stem's SocketClosed TRACE logs to the console
...
And fix some nearby comments.
Part of 30591.
2019-06-14 12:13:28 +10:00
Nick Mathewson
63325c0596
Add a chutney mode to travis.yml.
2019-06-12 08:55:38 -04:00
Nick Mathewson
b0826346a6
Travis: control "make check" with its own flag
...
Previously we had "make check" launched whenever DISTCHECK was
false. Now we'd like to turn it off in a few other circumstances,
like running chutney. Maybe stem too?
2019-06-12 08:51:46 -04:00
teor
dcb8cad4e6
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5
2019-06-11 14:51:46 +10:00
teor
a742a80eea
Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5
2019-06-11 14:51:37 +10:00
teor
202ccc3930
Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5
2019-06-11 14:48:52 +10:00
Nick Mathewson
5b07ff4011
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-10 18:44:31 -04:00
Nick Mathewson
c8447f95ec
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0
2019-06-10 18:44:20 -04:00
Nick Mathewson
6a72cc2598
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-10 18:33:26 -04:00
teor
430dd2da6e
Merge branch 'bug30713_035' into bug30713_040
2019-06-10 20:50:53 +10:00
teor
be0a4be276
Travis: Skip test_rebind on macOS builds
...
Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable
is set.
Skip test_rebind on macOS in Travis builds, because it is unreliable
on macOS on Travis.
Fixes bug 30713; bugfix on 0.3.5.1-alpha.
2019-06-10 20:49:59 +10:00
teor
d761c3ca6d
Travis: allow the test-stem job to fail
...
Allow the test-stem job to fail in Travis, because it sometimes hangs.
Fixes bug 30744; bugfix on 0.3.5.4-alpha.
2019-06-10 19:18:35 +10:00
Nick Mathewson
d63c17f2af
Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0
2019-06-05 16:22:29 -04:00
Nick Mathewson
851e881f01
Merge remote-tracking branch 'tor-github/pr/971' into maint-0.4.0
2019-06-05 16:12:07 -04:00
teor
cdda69ca8a
Travis: only run the stem tests that use a tor binary
...
Closes ticket 30694.
2019-05-30 20:05:03 +10:00
teor
9eb221b2d2
Travis: make stem log a controller trace, and tail stem's tor log
...
In Travis, make stem log a controller trace to the console.
And tail stem's tor log after failure.
Closes ticket 30591.
2019-05-28 10:20:36 +10:00
Nick Mathewson
669f6e34ea
Travis: fix an rng seed for coverage builds.
2019-05-15 07:50:56 -04:00
Nick Mathewson
0a2b96cae6
Merge remote-tracking branch 'tor-github/pr/989'
2019-05-02 08:36:09 -04:00
rl1987
10c71105e6
Travis: remove sudo configuration
...
See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
2019-04-30 09:16:33 +03:00
rl1987
5c00b25c0e
Travis: remove sudo configuration
...
See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
2019-04-30 09:15:31 +03:00
Nick Mathewson
6559aefc7b
Merge remote-tracking branch 'tor-github/pr/971'
2019-04-23 12:52:54 -04:00
teor
9a97b5ff56
Travis: Show stem's tor log after failure
...
Closes ticket 30234.
2019-04-22 11:48:07 +10:00
teor
c72f0cd5c7
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-17 16:46:40 +10:00
George Kadianakis
9ae267538c
Merge branch 'tor-github/pr/941'
2019-04-15 13:57:40 +03:00
teor
6d01879fe1
Travis: expand "make test-stem", so timelimit can signal python on timeout
...
Unlike kill, timelimit can only signal the process it launches. So we need
timelimit to launch python, not make.
Closes ticket 30117; diagnostic for 29437.
2019-04-12 08:38:30 -04:00
teor
6ef3819798
Travis: use stem backtrace signals with timelimit
...
Part of 30117.
2019-04-11 11:59:30 +10:00
teor
316aed502e
Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5
2019-04-06 09:32:53 +10:00
George Kadianakis
2cc3c98bc4
Merge branch 'tor-github/pr/901' into maint-0.4.0
2019-04-05 14:56:52 +03:00
George Kadianakis
7fe169a500
Merge branch 'tor-github/pr/879' into maint-0.4.0
2019-04-05 14:55:09 +03:00
