aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-01 20:59:13 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-01 20:59:13 -0400
commit48578e1512f2d5fa95e4fdde0564d2db8ee7f995 (patch)
treef21db11db33851aca8442f49ad65f62ad269260a /changes
parent24e0b1088acd94ceae3109107fa354b89309e2b7 (diff)
parenta68e6ea9c0288d82ea10076c551f48d63b3813fc (diff)
downloadtor-48578e1512f2d5fa95e4fdde0564d2db8ee7f995.tar
tor-48578e1512f2d5fa95e4fdde0564d2db8ee7f995.tar.gz
Merge branch 'bug9213_doc_024' into maint-0.2.4
Diffstat (limited to 'changes')
-rw-r--r--changes/bug9213_doc5
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug9213_doc b/changes/bug9213_doc
new file mode 100644
index 000000000..2f959dd83
--- /dev/null
+++ b/changes/bug9213_doc
@@ -0,0 +1,5 @@
+ o Documentation:
+ - Correctly document that we search for a system torrc file before
+ looking in ~/.torrc. Fixes documentation side of 9213; bugfix
+ on 0.2.3.18-rc.
+