sengler/tor-parallel-relay-conn @ 362bb5c625b831095e1d9dae1c348131257afab4

Roger Dingledine 362bb5c625 Merge branch 'maint-0.2.1' into maint-0.2.2		15 lat temu
..
annotations_fix	2a50dd9359 Enforce multiplicity rules when parsing annotations.	15 lat temu
bug2050	0a38358210 let unpublished bridges learn their ip address too	15 lat temu