diff options
author | teor <teor@torproject.org> | 2019-10-17 14:51:58 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-10-17 14:51:58 +1000 |
commit | e483257e1bc826b5678fcbf13084fd5d811f2b12 (patch) | |
tree | 01a443ba2f28c213252b5eaae5c822b361e571ac /changes | |
parent | a74c18069199763a45fa636d6748d22c4fe98eeb (diff) | |
parent | 4b8e5ea0dce85bb96ce92f171246aa101feda4ac (diff) | |
download | tor-e483257e1bc826b5678fcbf13084fd5d811f2b12.tar.gz tor-e483257e1bc826b5678fcbf13084fd5d811f2b12.zip |
Merge branch 'maint-0.3.5' into maint-0.4.0
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. |