Merge branch 'maint-0.3.1' into maint-0.3.2

diff --cc src/or/routerlist.c
Simple merge

diff --cc src/or/shared_random_state.c
Simple merge

diff --cc src/test/test_hs.c
Simple merge

diff --cc src/test/test_shared_random.c
Simple merge