commit 62c6d5fe168922c139ee75f6f8e4396a5e182426 Merge: ac3b559 8a33abc Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 11 14:33:55 2017 -0500 Merge remote-tracking branch 'dgoulet/ticket19925_030_01' src/or/control.c | 23 +++++++++++++++++++++++ src/or/shared_random.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/or/shared_random.h | 4 ++++ 3 files changed, 73 insertions(+)