commit af21d126e6b138c6f986f02c33c8c38d9bcd537f Merge: 1547fd99a 55865a2c9 Author: teor teor@torproject.org Date: Mon Mar 18 11:30:37 2019 +1000

Merge branch 'bug29706_035_minimal_merge' into bug29706_040_minimal_merge

Comment merge.

src/test/test_shared_random.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)