Forward port 06_add_compile_time_defaults

debian/changelog

 tor (0.2.2.15-alpha-1) experimental; urgency=low
 
   * New upstream version.
+  * Forward port 06_add_compile_time_defaults.
 
- -- Peter Palfrader <weasel@debian.org>  Sat, 21 Aug 2010 10:37:19 +0200
+ -- Peter Palfrader <weasel@debian.org>  Sat, 21 Aug 2010 10:39:41 +0200
 
 tor (0.2.2.14-alpha-1) experimental; urgency=low
 

debian/patches/06_add_compile_time_defaults.dpatch

@@ -31,9 +31,9 @@ diff -urNad tor~/src/or/config.c tor/src/or/config.c
  
  #include "or.h"
 +#include <pwd.h>
- #ifdef MS_WINDOWS
- #include <shlobj.h>
- #endif
+ #include "circuitbuild.h"
+ #include "circuitlist.h"
+ #include "config.h"
 @@ -717,6 +718,9 @@
  static void init_libevent(void);
  static int opt_streq(const char *s1, const char *s2);