commit a395d1aa46976fa09b9b0897213ba10c788a3f92 Merge: 2d139f7 51d18ae Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 24 11:29:14 2015 -0400

Merge branch 'underpinning_squashed'

changes/bug17135 | 7 +++ doc/tor.1.txt | 7 +++ src/or/config.c | 1 + src/or/dirserv.c | 27 +++++++----- src/or/keypin.c | 112 ++++++++++++++++++++++++++++++++++++------------ src/or/keypin.h | 3 +- src/or/or.h | 1 + src/test/test_keypin.c | 13 +++--- 8 files changed, 127 insertions(+), 44 deletions(-)