sengler/tor-parallel-relay-conn @ 6d2e02d79bf3cbd5d35fd65068485520cd6ef84b

Nick Mathewson 5beb8ee4e1 Merge remote branch 'sebastian/remove-osx-expert-package' into maint-0.2.2		%!s(int64=15) %!d(string=hai) anos
..
annotations_fix	2a50dd9359 Enforce multiplicity rules when parsing annotations.	%!s(int64=15) %!d(string=hai) anos
bug2050	0a38358210 let unpublished bridges learn their ip address too	%!s(int64=15) %!d(string=hai) anos
remove_osx_expert	fcdf1470c0 Remove everything related to os x expert package	%!s(int64=15) %!d(string=hai) anos