commit b161674d5dc312f95a495bed3c25d892fc9f0550 Merge: ede9cd4 dfcd3d9 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Aug 24 17:57:55 2011 -0400 Merge branch 'bufev_ratelim_and_wm' changes/bug3804 | 9 +++++++++ changes/bug3805 | 5 +++++ src/common/compat_libevent.c | 26 ++++++++++++++++++++++++++ src/common/compat_libevent.h | 6 ++++++ src/common/tortls.c | 5 +++++ src/or/connection.c | 7 ++++++- src/or/connection_or.c | 4 ++-- 7 files changed, 59 insertions(+), 3 deletions(-)