Merge branch 'maint-0.3.2'

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

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

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

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

diff --cc src/or/torcert.h
Simple merge