From: teor <teor@torproject.org>
Date: Mon, 18 Mar 2019 01:27:59 +0000 (+1000)
Subject: Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge
X-Git-Tag: tor-0.4.1.1-alpha~45^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d0146e2a23180d6c3764fd51a29f84a4127d58e;p=thirdparty%2Ftor.git

Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge
---

1d0146e2a23180d6c3764fd51a29f84a4127d58e
diff --cc src/or/dirauth/shared_random_state.h
index 60a326f86c,cf027f2d35..d31983d187
--- a/src/or/dirauth/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) */