diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-01 13:22:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-01 13:22:16 -0400 |
| commit | ef25f957e7912491ced116733e699ee341f2dadc (patch) | |
| tree | 5764fb29363c8a75f2e34833caee590c7f2eeb54 /src/or/config.c | |
| parent | 9635843342cb98340a965c40d9afcbe69c8d12df (diff) | |
| parent | 221f5238aed47f4436916a1da5c6f0423c7fe3e1 (diff) | |
| download | tor-ef25f957e7912491ced116733e699ee341f2dadc.tar.gz tor-ef25f957e7912491ced116733e699ee341f2dadc.zip | |
Merge branch 'tor_api_squashed'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index e913e5459c..c4d2062c83 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -82,6 +82,7 @@ #include "dirvote.h" #include "dns.h" #include "entrynodes.h" +#include "git_revision.h" #include "geoip.h" #include "hibernate.h" #include "main.h" @@ -883,8 +884,6 @@ set_options(or_options_t *new_val, char **msg) return 0; } -extern const char tor_git_revision[]; /* from tor_main.c */ - /** The version of this Tor process, as parsed. */ static char *the_tor_version = NULL; /** A shorter version of this Tor process's version, for export in our router |