sengler/tor-parallel-relay-conn @ 7d015c886a3fc985ab767de01811d1591f0ac86a

Nick Mathewson c2d3da6303 Merge remote-tracking branch 'origin/maint-0.2.2'		15 lat temu
..
bug3607	3e3aac5fd5 Untangle first sentence of changes/bug3607	15 lat temu
microdescs_on	b49e561f01 Turn on microdescriptors for clients	15 lat temu