Merge branch 'bug23817_031' into maint-0.3.2

diff --cc src/or/directory.c
Simple merge

diff --cc src/or/directory.h
index d26d83537799653db409113d239c122c5d7956ce,571c30a0fc541030d58b4c7bd3f79192597b69de..b57b7b544b8bee567c05a7ea31bc61870928506c
--- 1/src/or/directory.h
--- 2/src/or/directory.h
+++ b/src/or/directory.h
@@@ -191,8 -166,10 +191,10 @@@ STATIC char *accept_encoding_header(voi
  STATIC int allowed_anonymous_connection_compression_method(compress_method_t);
  STATIC void warn_disallowed_anonymous_compression_method(compress_method_t);
  
 -struct response_handler_args_t;
 -
 +STATIC int handle_response_fetch_hsdesc_v3(dir_connection_t *conn,
 +                                          const response_handler_args_t *args);
+ STATIC int handle_response_fetch_microdesc(dir_connection_t *conn,
 -                                 const struct response_handler_args_t *args);
++                                 const response_handler_args_t *args);
  
  #endif /* defined(DIRECTORY_PRIVATE) */
  

diff --cc src/or/entrynodes.c
Simple merge

diff --cc src/or/entrynodes.h
index 9e1e72993031a045405e6351823b4e249e72c492,29de627de0eb3e3c54a2fa8c2051ffcf95717be7..49bb3e55c456d7d3274fa3fff1e6471b45cd8e89
--- 1/src/or/entrynodes.h
--- 2/src/or/entrynodes.h
+++ b/src/or/entrynodes.h
@@@ -550,6 -557,16 +557,14 @@@ STATIC unsigned entry_guards_note_guard
                                                  unsigned old_state);
  STATIC int entry_guard_has_higher_priority(entry_guard_t *a, entry_guard_t *b);
  STATIC char *getinfo_helper_format_single_entry_guard(const entry_guard_t *e);
 -STATIC entry_guard_restriction_t *
 -guard_create_exit_restriction(const uint8_t *exit_id);
+ 
 -STATIC entry_guard_restriction_t *
 -guard_create_dirserver_md_restriction(void);
++STATIC entry_guard_restriction_t *guard_create_exit_restriction(
++                                                      const uint8_t *exit_id);
+ 
 -STATIC void
 -entry_guard_restriction_free(entry_guard_restriction_t *rst);
++STATIC entry_guard_restriction_t *guard_create_dirserver_md_restriction(void);
+ 
++STATIC void entry_guard_restriction_free(entry_guard_restriction_t *rst);
+ 
  #endif /* defined(ENTRYNODES_PRIVATE) */
  
  void remove_all_entry_guards_for_guard_selection(guard_selection_t *gs);

diff --cc src/or/microdesc.c
Simple merge

diff --cc src/or/networkstatus.c
index 2660e6a329276b06021c6b7db695060ba9957fd2,36e62020e3c1d33eb5c759c968bd6354ebe32c48..f31529733da8c40da89393fe50775a213491fbd1
--- 1/src/or/networkstatus.c
--- 2/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@@ -2009,11 -2037,13 +2009,14 @@@ networkstatus_set_current_consensus(con
               "consensus network status document (%s UTC).  Tor needs an "
               "accurate clock to work correctly. Please check your time and "
               "date settings!", dbuf, tbuf);
 -    control_event_general_status(LOG_WARN,
 -                    "CLOCK_SKEW MIN_SKEW=%ld SOURCE=CONSENSUS", delta);
 +    tor_asprintf(&flavormsg, "%s flavor consensus", flavor);
 +    clock_skew_warning(NULL, delta, 1, LD_GENERAL, flavormsg, "CONSENSUS");
 +    tor_free(flavormsg);
    }
  
+   /* We got a new consesus. Reset our md fetch fail cache */
+   microdesc_reset_outdated_dirservers_list();
+ 
    router_dir_info_changed();
  
    result = 0;