summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-02-02 13:32:53 -0500
committerNick Mathewson <nickm@torproject.org>2015-02-02 13:32:53 -0500
commit79c7625e38893920a80451ba420ee45ccd67f79b (patch)
tree67f108afb87191ad78751f94a0c7c72549de75ea /changes
parent69deab8b2a5f09577fa4f15190c3aac181f5b6af (diff)
parent1ebed7cc7758fdfc3786ef9c1edfa4388f43e8e2 (diff)
downloadtor-79c7625e38893920a80451ba420ee45ccd67f79b.tar.gz
tor-79c7625e38893920a80451ba420ee45ccd67f79b.zip
Merge branch 'feature13864_squashed'
Diffstat (limited to 'changes')
-rw-r--r--changes/feature138655
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/feature13865 b/changes/feature13865
new file mode 100644
index 0000000000..48291b4248
--- /dev/null
+++ b/changes/feature13865
@@ -0,0 +1,5 @@
+ o Minor features:
+ - Implement '-f -' CLI suboption to allow torrc to be read
+ from standard input, thus not requiring to store torrc in file
+ system. Implements feature 13865.
+