piros/tor: Code added to Tor to support PIR-based onion service descriptor lookups @ 5bf9890b3b18ad98f5ac601992bc08533ce9e209

Roger Dingledine 8e3830352f Merge branch 'maint-0.2.1' into maint-0.2.2		%!s(int64=13) %!d(string=hai) anos
..
Makefile.am	4ead083dbc Do not ship a fallback-consensus until the related bugs are fixed.	%!s(int64=16) %!d(string=hai) anos
geoip	51d6e95023 update to the july 2011 geoip db	%!s(int64=13) %!d(string=hai) anos
torrc.bridge.in	f9a4b3e45b Don't put a ControlPort without auth in sample bridge torrc	%!s(int64=14) %!d(string=hai) anos
torrc.sample.in	280dc1f9c7 change Bytes to B to fix ticket 1195.	%!s(int64=14) %!d(string=hai) anos