commit e11cc95717736f5818745654f24a2ee5440057d2 Merge: 87758db 34bd333 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 5 12:17:21 2016 -0400

Merge remote-tracking branch 'asn/bug19555'

src/or/shared_random.c | 13 ++++++++----- src/or/shared_random_state.c | 6 ++++++ 2 files changed, 14 insertions(+), 5 deletions(-)