Forward port 06_add_compile_time_defaults.dpatch

svn:r4970

debian/changelog

@@ -3,8 +3,9 @@ tor (0.1.1.5-alpha-cvs-1) UNRELEASED; urgency=low
   * Even more experimental cvs snapshot.
   * Testsuite is mandatory again.
   * Forward port 03_tor_manpage_in_section_8.dpatch
+  * Forward port 06_add_compile_time_defaults.dpatch
 
- -- Peter Palfrader <weasel@debian.org>  Fri,  9 Sep 2005 23:16:53 +0200
+ -- Peter Palfrader <weasel@debian.org>  Fri,  9 Sep 2005 23:22:38 +0200
 
 tor (0.1.1.5-alpha-1) UNRELEASED; urgency=low
 

debian/patches/06_add_compile_time_defaults.dpatch

@@ -41,9 +41,9 @@ diff -urNad tor-0.1.1.5/src/or/config.c /tmp/dpep.Xv4cHn/tor-0.1.1.5/src/or/conf
    VAR("PathlenCoinWeight",   DOUBLE,   PathlenCoinWeight,    "0.3"),
 -  VAR("PidFile",             STRING,   PidFile,              NULL),
 +  VAR("PidFile",             STRING,   PidFile,              "/var/run/tor/tor.pid"),
+   VAR("ReachableAddresses",  LINELIST, ReachableAddresses,   NULL),
    VAR("RecommendedVersions", LINELIST, RecommendedVersions,  NULL),
-   VAR("RedirectExit",        LINELIST, RedirectExit,         NULL),
-   VAR("RendExcludeNodes",    STRING,   RendExcludeNodes,     NULL),
+   VAR("RecommendedClientVersions", LINELIST, RecommendedClientVersions,  NULL),
 @@ -167,7 +167,7 @@
    VAR("RendPostPeriod",      INTERVAL, RendPostPeriod,       "20 minutes"),
    VAR("RephistTrackTime",    INTERVAL, RephistTrackTime,     "24 hours"),