Nick Mathewson 407441c652 Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6		2015-05-13 11:05:05 -04:00
..
bug15850	Revert "Remove obsolete workaround in dirserv_thinks_router_is_hs_dir()"	2015-04-28 14:30:07 -04:00
geoip6-april2015	Update geoip6 to the April 8 2015 database.	2015-04-24 17:51:36 +02:00
geoip-april2015	Update geoip to the April 8 2015 database.	2015-04-24 17:49:45 +02:00