commit 87758dbebc7ab624ba7b8802478ae2dc980d90c0 Merge: e889da1 cc34929 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 5 12:14:04 2016 -0400

Merge remote-tracking branch 'dgoulet/bug19567_029_01'

src/or/shared_random.h | 6 +++--- src/or/shared_random_state.c | 6 ++---- src/test/test_shared_random.c | 7 ++++--- 3 files changed, 9 insertions(+), 10 deletions(-)