sengler/tor-parallel-relay-conn @ 32948ebc5484d766cbf6f561ed41665e5f2fc192

Nick Mathewson eff5e29404 Merge branch 'maint-0.3.0' into maint-0.3.1		8 vuotta sitten
..
.dummy	df76da0f3b Add a .dummy file in the changes directory to stop git from removing it	10 vuotta sitten
bug22347	a73d0fe9a8 Document key-pinning-journal	8 vuotta sitten
bug22516	59f29970fa Permit the fchmod system call.	8 vuotta sitten
geoip-june2017	104e8fa751 Update geoip and geoip6 to the June 8 2017 database.	8 vuotta sitten
more-files	5641e27ffb Document more files in the datadirectory.	8 vuotta sitten