sengler/tor-parallel-relay-conn @ a4bf5b51e9c84a74720ea95eed19d21faf8333ae

Nick Mathewson a4bf5b51e9 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2		15 lat temu
..
annotations_fix	2a50dd9359 Enforce multiplicity rules when parsing annotations.	15 lat temu