summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-08-02 12:53:52 -0400
committerNick Mathewson <nickm@torproject.org>2010-08-02 12:53:52 -0400
commit9265190b16cae3b95f73bfb478e97b4fcfba0e17 (patch)
treef926c9d90e1af35c34298149a132c782d24dac58 /changes
parent73a4c0690edd49ea8fec2b8034bc2b0b681acdb0 (diff)
parenta9d055c5c516924b2e87e416b154bf220b0a914e (diff)
downloadtor-9265190b16cae3b95f73bfb478e97b4fcfba0e17.tar.gz
tor-9265190b16cae3b95f73bfb478e97b4fcfba0e17.zip
Merge branch 'bug1384'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug13845
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug1384 b/changes/bug1384
new file mode 100644
index 0000000000..9c406d9e25
--- /dev/null
+++ b/changes/bug1384
@@ -0,0 +1,5 @@
+ o Minor features:
+ - Warn when the same option is provided more then once in a torrc file,
+ on the command line, or in a single SETCONF statement, and option
+ is one that only accepts a single value. Closes bug 1384.
+