sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Partial backport. Clean up a macro/cpp interaction related to bug 707. 

svn:r15306
This commit is contained in:
Nick Mathewson 2008-06-16 18:16:42 +00:00
parent 01d712164d
commit e82fcbeac1
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Changes in version 0.2.0.29 - 2008-06-13
o Minor bugfixes:
- Fix a macro/CPP interactions that was confusing some compilers.
Changes in version 0.2.0.28-rc - 2008-06-13
o Anonymity fixes:
- Fix a bug where, when we were choosing the 'end stream reason' to

7
src/or/config.c
View File

@ -198,13 +198,12 @@ static config_var_t _option_vars[] = {
V(FetchServerDescriptors, BOOL, "1"),
V(FetchHidServDescriptors, BOOL, "1"),
V(FetchUselessDescriptors, BOOL, "0"),
V(GeoIPFile, STRING,
#ifdef WIN32
"<default>"
V(GeoIPFile, STRING, "<default>"),
#else
SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"
V(GeoIPFile, STRING,
SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
#endif
),
V(Group, STRING, NULL),
V(HardwareAccel, BOOL, "0"),
V(HashedControlPassword, LINELIST, NULL),