mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-20 12:22:14 +02:00
include the geoip file in the tarball, and load it by default
when tor starts. this breaks rpms and maybe other packages. svn:r14764
This commit is contained in:
parent
60ca544578
commit
7f61dafe8d
5
LICENSE
5
LICENSE
@ -77,4 +77,9 @@ If you got Tor as a static binary with OpenSSL included, then you should know:
|
|||||||
"This product includes software developed by the OpenSSL Project
|
"This product includes software developed by the OpenSSL Project
|
||||||
for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
||||||
===============================================================================
|
===============================================================================
|
||||||
|
"This program uses the IP-to-Country Database provided by
|
||||||
|
WebHosting.Info (http://www.webhosting.info), available from
|
||||||
|
http://ip-to-country.webhosting.info."
|
||||||
|
See the src/config/geoip file in particular.
|
||||||
|
===============================================================================
|
||||||
|
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
confdir = $(sysconfdir)/tor
|
confdir = $(sysconfdir)/tor
|
||||||
|
|
||||||
#EXTRA_DIST = fallback-consensus
|
EXTRA_DIST = fallback-consensus geoip
|
||||||
|
|
||||||
conf_DATA = torrc.sample
|
conf_DATA = torrc.sample
|
||||||
|
|
||||||
#data_DATA = fallback-consensus
|
data_DATA = fallback-consensus geoip
|
||||||
|
|
||||||
# If we don't have it, fake it.
|
# If we don't have it, fake it.
|
||||||
fallback-consensus:
|
fallback-consensus:
|
||||||
touch fallback-consensus
|
touch fallback-consensus
|
||||||
|
|
||||||
|
@ -198,7 +198,8 @@ static config_var_t _option_vars[] = {
|
|||||||
V(FetchServerDescriptors, BOOL, "1"),
|
V(FetchServerDescriptors, BOOL, "1"),
|
||||||
V(FetchHidServDescriptors, BOOL, "1"),
|
V(FetchHidServDescriptors, BOOL, "1"),
|
||||||
V(FetchUselessDescriptors, BOOL, "0"),
|
V(FetchUselessDescriptors, BOOL, "0"),
|
||||||
V(GeoIPFile, STRING, NULL),
|
V(GeoIPFile, STRING,
|
||||||
|
SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
|
||||||
V(Group, STRING, NULL),
|
V(Group, STRING, NULL),
|
||||||
V(HardwareAccel, BOOL, "0"),
|
V(HardwareAccel, BOOL, "0"),
|
||||||
V(HashedControlPassword, LINELIST, NULL),
|
V(HashedControlPassword, LINELIST, NULL),
|
||||||
|
Loading…
Reference in New Issue
Block a user