Merge branch 'bug8787_squashed'

changes/bug8787

src/common/compat.c

src/common/compat.h

src/common/tortls.c

src/common/util.c

src/or/config.c

src/or/hibernate.c

src/or/main.c

src/or/microdesc.c

src/or/networkstatus.c

src/or/routerlist.c

src/or/statefile.c

src/test/test_util.c