[or-cvs] Forward port 06_add_compile_time_defaults.dpatch

[Peter Palfrader]

Update of /home/or/cvsroot/tor/debian/patches
In directory moria:/tmp/cvs-serv26351/debian/patches

Modified Files:
	06_add_compile_time_defaults.dpatch 
Log Message:
Forward port 06_add_compile_time_defaults.dpatch


Index: 06_add_compile_time_defaults.dpatch
===================================================================
RCS file: /home/or/cvsroot/tor/debian/patches/06_add_compile_time_defaults.dpatch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 06_add_compile_time_defaults.dpatch	12 Aug 2005 15:04:22 -0000	1.4
+++ 06_add_compile_time_defaults.dpatch	9 Sep 2005 21:22:52 -0000	1.5
@@ -41,9 +41,9 @@
    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"),