aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-01 13:22:16 -0400
committerNick Mathewson <nickm@torproject.org>2017-11-01 13:22:16 -0400
commitef25f957e7912491ced116733e699ee341f2dadc (patch)
tree5764fb29363c8a75f2e34833caee590c7f2eeb54 /src/or/main.h
parent9635843342cb98340a965c40d9afcbe69c8d12df (diff)
parent221f5238aed47f4436916a1da5c6f0423c7fe3e1 (diff)
downloadtor-ef25f957e7912491ced116733e699ee341f2dadc.tar.gz
tor-ef25f957e7912491ced116733e699ee341f2dadc.zip
Merge branch 'tor_api_squashed'
Diffstat (limited to 'src/or/main.h')
-rw-r--r--src/or/main.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/or/main.h b/src/or/main.h
index 5ab77c03ed..8eb977575e 100644
--- a/src/or/main.h
+++ b/src/or/main.h
@@ -76,8 +76,6 @@ void release_lockfile(void);
void tor_cleanup(void);
void tor_free_all(int postfork);
-int tor_main(int argc, char *argv[]);
-
int do_main_loop(void);
int tor_init(int argc, char **argv);