aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-04-02 11:45:18 +1000
committerteor <teor@torproject.org>2019-04-02 11:45:18 +1000
commit6c273d86edd57b2b7203a2a4301123486394d1d0 (patch)
tree6df6659279d803a43800972c0d9058109c03cd84
parent5600373e88ddd299be3e7043921cd36199620dc6 (diff)
parent74775b2dfd1a30abf75f2989195ec6c1bbe95fc0 (diff)
downloadtor-6c273d86edd57b2b7203a2a4301123486394d1d0.tar.gz
tor-6c273d86edd57b2b7203a2a4301123486394d1d0.zip
Merge branch 'maint-0.3.4' into release-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.