diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-09-10 13:50:00 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-09-10 13:50:00 +0000 |
| commit | a04e584cbc398155ceca80b9ca091d0f4d113418 (patch) | |
| tree | 0bfb8d5a85ee1671dd3e19709e13cc68afe5719f /src/or | |
| parent | 615d19fe4c34a0c270e16268eff135fb9e976eb1 (diff) | |
| download | tor-a04e584cbc398155ceca80b9ca091d0f4d113418.tar.gz tor-a04e584cbc398155ceca80b9ca091d0f4d113418.zip | |
r15005@catbus: nickm | 2007-09-10 09:49:03 -0400
Undo brokenness from merge conflict.
svn:r11414
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/ntmain.c | 1 | ||||
| -rw-r--r-- | src/or/or.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/or/ntmain.c b/src/or/ntmain.c index b27a73fcef..e460582e1f 100644 --- a/src/or/ntmain.c +++ b/src/or/ntmain.c @@ -762,4 +762,3 @@ nt_service_parse_options(int argc, char **argv, int *should_exit) return 0; } - diff --git a/src/or/or.h b/src/or/or.h index 9d625d3df9..c1d879bbe7 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3025,6 +3025,7 @@ void do_hash_password(void); int tor_init(int argc, char **argv); #endif +/********************************* ntmain.c ***************************/ #ifdef MS_WINDOWS #define NT_SERVICE #endif |