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

Roger Dingledine 54ccc80a4a Merge branch 'maint-0.2.1' into maint-0.2.2		%!s(int64=15) %!d(string=hai) anos
..
Makefile.am	4ead083dbc Do not ship a fallback-consensus until the related bugs are fixed.	%!s(int64=18) %!d(string=hai) anos
geoip	9c2cb6fc89 Update to the February 1 2011 Maxmind GeoLite Country database.	%!s(int64=15) %!d(string=hai) anos
torrc.bridge.in	f9a4b3e45b Don't put a ControlPort without auth in sample bridge torrc	%!s(int64=16) %!d(string=hai) anos
torrc.sample.in	280dc1f9c7 change Bytes to B to fix ticket 1195.	%!s(int64=16) %!d(string=hai) anos