diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-12-18 13:16:49 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-12-18 13:16:49 -0500 |
| commit | c4fb7ad0348a190be8496b429aa96982f1b26917 (patch) | |
| tree | 5898237d9b67e5669448b8265ae1415fc1c19aab /src/or/config.h | |
| parent | 14c9b9905180a21b8aa648b642ff5d3f7d86e29f (diff) | |
| parent | ea6f88478cec6b3151a992cf2fd99539997ebb94 (diff) | |
| download | tor-c4fb7ad0348a190be8496b429aa96982f1b26917.tar.gz tor-c4fb7ad0348a190be8496b429aa96982f1b26917.zip | |
Merge branch 'feature12538_028_01_squashed'
Diffstat (limited to 'src/or/config.h')
| -rw-r--r-- | src/or/config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/config.h b/src/or/config.h index bfdd1694eb..6e08f9d178 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -158,6 +158,8 @@ STATIC int parse_dir_authority_line(const char *line, dirinfo_type_t required_type, int validate_only); STATIC int parse_dir_fallback_line(const char *line, int validate_only); +STATIC int have_enough_mem_for_dircache(const or_options_t *options, + size_t total_mem, char **msg); #endif #endif |