diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-10-02 15:04:28 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-10-02 15:04:28 +0200 |
| commit | 21c201202effaa18ba591ca96043ec9489566e0c (patch) | |
| tree | 63ca73de5c1f682e2f19575674866586b3029e7e /src/or/config.c | |
| parent | 7bd22474830c839b53c4e4ab68d572806993c52f (diff) | |
| parent | 4ff08bb5811ddfe554e597d129ec48a774364480 (diff) | |
| download | tor-21c201202effaa18ba591ca96043ec9489566e0c.tar.gz tor-21c201202effaa18ba591ca96043ec9489566e0c.zip | |
Merge remote-tracking branch 'twstrike/dir-handle-cmd-get'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index f8fc757a2a..22039b46ef 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -626,8 +626,8 @@ static char *global_dirfrontpagecontents = NULL; static smartlist_t *configured_ports = NULL; /** Return the contents of our frontpage string, or NULL if not configured. */ -const char * -get_dirportfrontpage(void) +MOCK_IMPL(const char*, +get_dirportfrontpage, (void)) { return global_dirfrontpagecontents; } |