nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 04:56:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/merge-requests/460' into ahf/android-gp-fixes-bulk

Browse Source
This commit is contained in:
Alexander Færøy 2023-09-13 18:29:38 +02:00
commit 1cf796d3b4
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/config/config.c
View File

@ -483,6 +483,13 @@ static const config_var_t option_vars_[] = {
#ifdef _WIN32
V(GeoIPFile, FILENAME, "<default>"),
V(GeoIPv6File, FILENAME, "<default>"),
#elif defined(__ANDROID__)
/* Android apps use paths that are configured at runtime.
* /data/local/tmp is guaranteed to exist, but will only be
* usable by the 'shell' and 'root' users, so this fallback is
* for debugging only. */
V(GeoIPFile, FILENAME, "/data/local/tmp/geoip"),
V(GeoIPv6File, FILENAME, "/data/local/tmp/geoip6"),
#else
V(GeoIPFile, FILENAME,
SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),