[or-cvs] r11412: (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-09-10 09:47:56 -0400 (Mon, 10 Sep 2007)
New Revision: 11412

Modified:
   tor/trunk/
   tor/trunk/src/or/main.c
   tor/trunk/src/or/ntmain.c
   tor/trunk/src/or/or.h
Log:



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r14950] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/main.c
===================================================================

Modified: tor/trunk/src/or/ntmain.c
===================================================================
--- tor/trunk/src/or/ntmain.c	2007-09-10 13:35:14 UTC (rev 11411)
+++ tor/trunk/src/or/ntmain.c	2007-09-10 13:47:56 UTC (rev 11412)
@@ -762,3 +762,4 @@
   return 0;
 }
 
+

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2007-09-10 13:35:14 UTC (rev 11411)
+++ tor/trunk/src/or/or.h	2007-09-10 13:47:56 UTC (rev 11412)
@@ -3025,7 +3025,6 @@
 int tor_init(int argc, char **argv);
 #endif
 
-/********************************* ntmain.c ***************************/
 #ifdef MS_WINDOWS
 #define NT_SERVICE
 #endif