aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-04-02 11:45:13 +1000
committerteor <teor@torproject.org>2019-04-02 11:45:13 +1000
commit74775b2dfd1a30abf75f2989195ec6c1bbe95fc0 (patch)
treeee2cbe2dae0ced3f8cd2a3d85713a9bb23a8e478
parent6d057c56f170a7d72751b9557c78c2f6ee5735b9 (diff)
parentf7688cb179e5114c5b24b71acd0b57bbd6d3d4ad (diff)
downloadtor-74775b2dfd1a30abf75f2989195ec6c1bbe95fc0.tar.gz
tor-74775b2dfd1a30abf75f2989195ec6c1bbe95fc0.zip
Merge branch 'maint-0.2.9' into maint-0.3.4
-rw-r--r--changes/bug297034
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug29703 b/changes/bug29703
new file mode 100644
index 0000000000..0e17ee45e6
--- /dev/null
+++ b/changes/bug29703
@@ -0,0 +1,4 @@
+ o Minor bugfixes (testing):
+ - Backport the 0.3.4 src/test/test-network.sh to 0.2.9.
+ We need a recent test-network.sh to use new chutney features in CI.
+ Fixes bug 29703; bugfix on 0.2.9.1-alpha.