Nick Mathewson c66138609a Merge remote branch 'origin/maint-0.2.1' %!s(int64=15) %!d(string=hai) anos
..
bug1843 219f7415d1 Warn for bad combination of cookie options %!s(int64=15) %!d(string=hai) anos
bug1848 2af6aadfe9 Fix a compile warning on OpenBSD %!s(int64=15) %!d(string=hai) anos
openbsd-sysheaders 30b766ba12 Use -Wno-system-headers on openbsd to resolve 2nd case of bug1848 %!s(int64=15) %!d(string=hai) anos