Nick Mathewson a4bf5b51e9 Merge remote branch 'origin/maint-0.2.1' 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