summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-10-17 14:51:02 +1000
committerteor <teor@torproject.org>2019-10-17 14:51:02 +1000
commit13daf339a903da74051ac9d51d8bb5b386be64f8 (patch)
tree21bdb56706ffdf8e6ca133467b32b1268612fe4a /changes
parent4dcbbe4166192beae321001e820bd3c15a8f2512 (diff)
parente5dda7f66477dad699c654c54978bbad9a999847 (diff)
downloadtor-13daf339a903da74051ac9d51d8bb5b386be64f8.tar.gz
tor-13daf339a903da74051ac9d51d8bb5b386be64f8.zip
Merge remote-tracking branch 'tor-github/pr/1372' into maint-0.4.1
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.