Merge branch 'underpinning_squashed'

changes/bug17135

doc/tor.1.txt

src/or/config.c

src/or/dirserv.c

src/or/keypin.c

src/or/keypin.h

src/or/or.h

src/test/test_keypin.c