diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-11-04 21:44:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-04 21:44:31 -0500 |
| commit | 626a8b60d7752f38e6587bed9b614c6d039dd9f7 (patch) | |
| tree | 227f93749508620dc346d2828ade36f47e123517 /src/or/or.h | |
| parent | e5ca5040a56b74f3d0de82d74946f0d9c7d44cc3 (diff) | |
| parent | ffddd4de2a69a896be3886b8f48a218a70babbcc (diff) | |
| download | tor-626a8b60d7752f38e6587bed9b614c6d039dd9f7.tar.gz tor-626a8b60d7752f38e6587bed9b614c6d039dd9f7.zip | |
Merge remote-tracking branch 'linus/bug5053-bug5055'
Conflicts:
src/or/geoip.c
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index b59c079c48..6510725f69 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3657,8 +3657,9 @@ typedef struct { * the bridge authority guess which countries have blocked access to us. */ int BridgeRecordUsageByCountry; - /** Optionally, a file with GeoIP data. */ + /** Optionally, IPv4 and IPv6 GeoIP data. */ char *GeoIPFile; + char *GeoIPv6File; /** If true, SIGHUP should reload the torrc. Sometimes controllers want * to make this false. */ |