aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-02-27 11:36:56 -0500
committerNick Mathewson <nickm@torproject.org>2017-02-27 11:36:56 -0500
commit4808540d5c8e132c6ea4db13e25faff6446dc674 (patch)
tree0e21e2e6e796ed32729aa17878057ab13bf363b5 /changes
parentb6a9be0415587b161e59702a56cbfa42d1ac31c8 (diff)
parenteef8bd4d3c49bf093f11bf6fa81bfd8561f02fc5 (diff)
downloadtor-4808540d5c8e132c6ea4db13e25faff6446dc674.tar.gz
tor-4808540d5c8e132c6ea4db13e25faff6446dc674.zip
Merge branch 'maint-0.3.0'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug215624
-rw-r--r--changes/feature215705
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/bug21562 b/changes/bug21562
new file mode 100644
index 0000000000..48396a00e7
--- /dev/null
+++ b/changes/bug21562
@@ -0,0 +1,4 @@
+ o Minor bugfixes (testing):
+ - Use bash in src/test/test-network.sh. This ensures we reliably call
+ chutney's newer tools/test-network.sh when available.
+ Fixes bug 21562; bugfix on tor-0.2.9.1-alpha.
diff --git a/changes/feature21570 b/changes/feature21570
new file mode 100644
index 0000000000..40555eefa9
--- /dev/null
+++ b/changes/feature21570
@@ -0,0 +1,5 @@
+ o Minor features (testing):
+ - During 'make test-network-all', if tor logs any warnings, ask chutney
+ to output them. Requires a recent version of chutney with the 21572
+ patch.
+ Implements 21570.