Merge branch 'tor-gitlab/mr/121' into maint-0.4.4

diff --cc src/app/config/config.c
Simple merge

diff --cc src/app/config/config.h
index 17caa0e3ff8d9c32ebd52b05cfe1a35f2a4a62d0,35905ef7674b9bef7a7f583fe1bbf19f630b66f7..1ba10d1d37618f0ee3ba30f126726c3ab3fa13b9
--- 1/src/app/config/config.h
--- 2/src/app/config/config.h
+++ b/src/app/config/config.h
@@@ -292,9 -277,20 +292,9 @@@ STATIC int parse_dir_authority_line(con
                                      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);
 -STATIC int parse_port_config(smartlist_t *out,
 -                  const struct config_line_t *ports,
 -                  const char *portname,
 -                  int listener_type,
 -                  const char *defaultaddr,
 -                  int defaultport,
 -                  const unsigned flags);
 -
 -STATIC int check_bridge_distribution_setting(const char *bd);
  
  STATIC uint64_t compute_real_max_mem_in_queues(const uint64_t val,
-                                                int log_guess);
+                                                bool is_server);
  STATIC int open_and_add_file_log(const log_severity_list_t *severity,
                                   const char *fname,
                                   int truncate_log);