sengler/tor-parallel-relay-conn @ 54551f3148d3fbd66b49f2f9d201c4e86d69d65b

Nick Mathewson 54551f3148 Merge branch 'fix2183', remote branch 'rransom/fix2195-v2' into maint-0.2.2		15 lat temu
..
bug2183	cec21652a7 Try harder not to exceed the 50 KB extra-info descriptor limit.	15 lat temu
bug2195	b3470ce957 Add changes file for bug2195.	15 lat temu