aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-10-17 14:50:28 +1000
committerteor <teor@torproject.org>2019-10-17 14:50:28 +1000
commit702aa8f775591942f276286ab285fcb8fe80d32f (patch)
tree8ea8991889eb495d477d773404a630b02a4bffeb /changes
parent7b9cb4c47bc9d1ca4e120af2b00a0f0747cd7b20 (diff)
parent632e707397ce95632f4c059a0d285870624eaa33 (diff)
downloadtor-702aa8f775591942f276286ab285fcb8fe80d32f.tar.gz
tor-702aa8f775591942f276286ab285fcb8fe80d32f.zip
Merge remote-tracking branch 'tor-github/pr/1370' into maint-0.3.5
Diffstat (limited to 'changes')
-rw-r--r--changes/ticket308603
-rw-r--r--changes/ticket318593
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.