Nick Mathewson 669fd05ed8 Merge remote branch 'origin/maint-0.2.1'		2010-09-08 10:28:41 -04:00
..
bug1840	Close a non-open OR connection *only* after KeepalivePeriod.	2010-09-03 11:32:35 -04:00
bug1843	Warn for bad combination of cookie options	2010-08-20 02:45:10 +02:00
bug1848	Fix a compile warning on OpenBSD	2010-08-22 13:58:23 +02:00
log-ratelim	Add a generic rate-limited log mechanism, and use it in a few places	2010-08-18 15:55:49 -04:00
openbsd-sysheaders	Use -Wno-system-headers on openbsd to resolve 2nd case of bug1848	2010-08-26 19:03:51 +02:00
win32_unicode	Make the windows build succeed with or without -DUNICODE enabled.	2010-08-20 13:40:01 -04:00