Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge

diff --cc src/or/dirauth/shared_random_state.c
Simple merge

diff --cc src/or/dirauth/shared_random_state.h
index 60a326f86c76ff579c5d90bd9491aec316b81c4f,cf027f2d35e16868fb4567d6853a76154cfdfaa4..d31983d18783cccfe1c25cec5f70b68dd539e544
--- 1/src/or/dirauth/shared_random_state.h
--- 2/src/or/shared_random_state.h
+++ b/src/or/dirauth/shared_random_state.h
@@@ -140,8 -140,10 +140,10 @@@ STATIC int is_phase_transition(sr_phase
  
  STATIC void set_sr_phase(sr_phase_t phase);
  STATIC sr_state_t *get_sr_state(void);
+ STATIC void state_del_previous_srv(void);
+ STATIC void state_del_current_srv(void);
  
 -#endif /* TOR_UNIT_TESTS */
 +#endif /* defined(TOR_UNIT_TESTS) */
  
 -#endif /* TOR_SHARED_RANDOM_STATE_H */
 +#endif /* !defined(TOR_SHARED_RANDOM_STATE_H) */
  

diff --cc src/test/test_shared_random.c
Simple merge