Nick Mathewson 669fd05ed8 Merge remote branch 'origin/maint-0.2.1' %!s(int64=15) %!d(string=hai) anos
..
bug1840 4d2e9974f9 Close a non-open OR connection *only* after KeepalivePeriod. %!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
log-ratelim ba9c1275c4 Add a generic rate-limited log mechanism, and use it in a few places %!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
win32_unicode c0c7868250 Make the windows build succeed with or without -DUNICODE enabled. %!s(int64=15) %!d(string=hai) anos