sengler/tor-parallel-relay-conn @ 2f41dc3b9ead65402121132b03c7e4758117025b

Nick Mathewson 382c27d8a9 Merge branch 'ticket2325_squashed'		9 vuotta sitten
..
.dummy	df76da0f3b Add a .dummy file in the changes directory to stop git from removing it	9 vuotta sitten
bug16162	6632a731fd Use a more recommended syntax for the systemd unit file	9 vuotta sitten
bug16631	6e1eaa936a changes file for bug16631	9 vuotta sitten
ticket2325	7521c3ee91 Document the torrc format as thoroughly as possible	9 vuotta sitten