Merge branch 'feature13864_squashed'

This commit is contained in:
Nick Mathewson
2015-02-02 13:32:53 -05:00
3 changed files with 31 additions and 2 deletions
+5
View File
@@ -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.