diff options
author | teor <teor@torproject.org> | 2019-10-01 17:20:16 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-10-01 17:31:55 +1000 |
commit | f368f5bc370d23f2e1888faeeceecb1cea290242 (patch) | |
tree | e5ef74bbb4cef95f1c363b40d47e5e46fabecae1 /changes | |
parent | 02840169d860384257042bdf6d7601c2bf48b47b (diff) | |
parent | 1e0e23c1e48ebc388f7a16a08a3f12e01db15bfa (diff) | |
download | tor-f368f5bc370d23f2e1888faeeceecb1cea290242.tar.gz tor-f368f5bc370d23f2e1888faeeceecb1cea290242.zip |
Merge branch 'bug31859_029' into bug31859_035
While merging:
* leave out some redundant jobs and build matrix entries
Diffstat (limited to 'changes')
-rw-r--r-- | changes/ticket30860 | 3 | ||||
-rw-r--r-- | changes/ticket31859 | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/ticket30860 b/changes/ticket30860 new file mode 100644 index 0000000000..b946f735c4 --- /dev/null +++ b/changes/ticket30860 @@ -0,0 +1,3 @@ + o Testing: + - Run the chutney IPv6 networks as part of Travis CI. + Closes ticket 30860. diff --git a/changes/ticket31859 b/changes/ticket31859 new file mode 100644 index 0000000000..dbc591e00b --- /dev/null +++ b/changes/ticket31859 @@ -0,0 +1,3 @@ + o Testing: + - Simplify the Travis CI build matrix, and optimise for build time. + Closes ticket 31859. |