summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-11-12 14:13:17 -0500
committerNick Mathewson <nickm@torproject.org>2010-11-12 14:13:17 -0500
commit3d7772ece3128097f4d541585e525c61f6ea27c2 (patch)
treecab8cee7627067f9c09d189eb8e666ee14914bab /doc
parentd61736aa6a226a935b8dbfd90bc86b60a99149b1 (diff)
parent8833381d9c6ae274599b16fc11cec7527b12c465 (diff)
downloadtor-3d7772ece3128097f4d541585e525c61f6ea27c2.tar.gz
tor-3d7772ece3128097f4d541585e525c61f6ea27c2.zip
Merge remote branch 'karsten/enhancement1883'
Diffstat (limited to 'doc')
-rw-r--r--doc/spec/dir-spec.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/spec/dir-spec.txt b/doc/spec/dir-spec.txt
index 4a7a557b31..04e73c4676 100644
--- a/doc/spec/dir-spec.txt
+++ b/doc/spec/dir-spec.txt
@@ -622,6 +622,12 @@
As documented in 2.1 above. See migration notes in section 2.2.1.
+ "geoip-db-digest" Digest NL
+ [At most once.]
+
+ SHA1 digest of the GeoIP database file that is used to resolve IP
+ addresses to country codes.
+
("geoip-start" YYYY-MM-DD HH:MM:SS NL)
("geoip-client-origins" CC=N,CC=N,... NL)