aboutsummaryrefslogtreecommitdiff
path: root/changes/ticket29702
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-06-11 14:46:24 +1000
committerteor <teor@torproject.org>2019-06-11 14:46:24 +1000
commitcb20054ccda422ddf5af29d4bf5c55fa3a701e1f (patch)
tree31337b204fed6832be6b47d8fe9a2ebf62fe5bef /changes/ticket29702
parente5deb2bbc73d8830ae6c479a4532e72112f5484a (diff)
parent12b9bfc05f3a163b44f0f8b6638f027de16e622b (diff)
downloadtor-cb20054ccda422ddf5af29d4bf5c55fa3a701e1f.tar.gz
tor-cb20054ccda422ddf5af29d4bf5c55fa3a701e1f.zip
Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5
Diffstat (limited to 'changes/ticket29702')
-rw-r--r--changes/ticket297024
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/ticket29702 b/changes/ticket29702
new file mode 100644
index 0000000000..e1cc1f867b
--- /dev/null
+++ b/changes/ticket29702
@@ -0,0 +1,4 @@
+ o Testing:
+ - Specify torrc paths (with empty files) when launching tor in
+ integration tests; refrain from reading user and system torrcs.
+ Resolves issue 29702.