sengler/tor-parallel-relay-conn @ 08efa70c41b258d8655ec01bdb721aea96b42d46

Nick Mathewson 08efa70c41 Merge remote-tracking branch 'origin/maint-0.2.2'		%!s(int64=14) %!d(string=hai) anos
..
bug2379	b04dca448d Add some missing torrc entries to tor.1.txt	%!s(int64=14) %!d(string=hai) anos
warn-if-get_digest-fails	66339f74b4 Handle crypto_pk_get_digest failures semi-sensibly	%!s(int64=14) %!d(string=hai) anos