[tor-commits] [tor/master] Merge remote-tracking branch 'jigsaw/fix-19562'

commit 3e8f93bb103d3537703c168a82450aeab5f96710 Merge: fdc2a91 8c0fdf6 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Aug 19 19:41:53 2016 -0400 Merge remote-tracking branch 'jigsaw/fix-19562' src/or/dirvote.c | 11 +++++++++-- src/or/dirvote.h | 2 ++ src/or/shared_random.c | 2 +- src/or/shared_random_state.c | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-)