Merge branch 'maint-0.3.2' into maint-0.3.3

src/or/routerlist.c

src/or/shared_random_state.c

src/test/test_hs.c

src/test/test_shared_random.c