[tor-commits] [tor/maint-0.3.5] Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge

[teor at torproject.org]

commit 1d0146e2a23180d6c3764fd51a29f84a4127d58e
Merge: e021f89f3 c44ad396f
Author: teor <teor at torproject.org>
Date:   Mon Mar 18 11:27:59 2019 +1000

    Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge

 changes/bug29706_minimal             |  4 ++++
 src/or/dirauth/shared_random_state.c |  4 ++--
 src/or/dirauth/shared_random_state.h |  2 ++
 src/test/test_shared_random.c        | 17 ++++++++++++++---
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --cc src/or/dirauth/shared_random_state.h
index 60a326f86,cf027f2d3..d31983d18
--- 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) */