diff options
| author | teor <teor@torproject.org> | 2019-08-08 11:17:46 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-08-08 11:17:46 +1000 |
| commit | e83eabc9bfb6c07f80611beb6b02d43102806a0e (patch) | |
| tree | bb3aa63e372db87bc3602516768332001cd33fa7 /changes | |
| parent | 1bc2ae7be7c0f418de565b4a11bbb5d510c958a9 (diff) | |
| parent | 5fda19030930d0609734191911f971e23aa5359c (diff) | |
| download | tor-e83eabc9bfb6c07f80611beb6b02d43102806a0e.tar.gz tor-e83eabc9bfb6c07f80611beb6b02d43102806a0e.zip | |
Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5
Merge changed chutney and stem script lines from 29280 with changed
stem script lines from 30591.
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/ticket30591 | 3 | ||||
| -rw-r--r-- | changes/ticket30694 | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/ticket30591 b/changes/ticket30591 new file mode 100644 index 0000000000..f97c024009 --- /dev/null +++ b/changes/ticket30591 @@ -0,0 +1,3 @@ + o Testing (continuous integration): + - In Travis, make stem log a controller trace to the console. And tail + stem's tor log after failure. Closes ticket 30591. diff --git a/changes/ticket30694 b/changes/ticket30694 new file mode 100644 index 0000000000..70dbf6481a --- /dev/null +++ b/changes/ticket30694 @@ -0,0 +1,3 @@ + o Testing (continuous integration): + - In Travis, only run the stem tests that use a tor binary. + Closes ticket 30694. |