summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-02-01 17:24:08 -0500
committerNick Mathewson <nickm@torproject.org>2013-02-01 17:24:08 -0500
commitacb43c0735af8a7cd9e8eb57bb8835b11a90a1be (patch)
treebe1f63b73dc0824fc6614baca18369230f06e31a /src/or/or.h
parentc93f66b1037e151268b5662f3957d13c4c94d1fb (diff)
parentec7ffed79da3f84d4bff7b92434f872dd228102c (diff)
downloadtor-acb43c0735af8a7cd9e8eb57bb8835b11a90a1be.tar.gz
tor-acb43c0735af8a7cd9e8eb57bb8835b11a90a1be.zip
Merge remote-tracking branch 'public/feature7706'
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 11158ff6f8..a0a921a9f4 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3883,6 +3883,11 @@ typedef struct {
char *GeoIPFile;
char *GeoIPv6File;
+ /** Autobool: if auto, then any attempt to Exclude{Exit,}Nodes a particular
+ * country code will exclude all nodes in ?? and A1. If true, all nodes in
+ * ?? and A1 are excluded. Has no effect if we don't know any GeoIP data. */
+ int GeoIPExcludeUnknown;
+
/** If true, SIGHUP should reload the torrc. Sometimes controllers want
* to make this false. */
int ReloadTorrcOnSIGHUP;