[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug3683'

commit ce878874615cb1d1c1636d6706a20c77e90342a3 Merge: d690a99 413574a Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 5 20:21:27 2011 -0400

Merge remote-tracking branch 'public/bug3683'

src/or/buffers.c | 10 ++++++- src/or/circuitlist.c | 10 ++++++- src/or/connection_edge.c | 60 ++++++++++++++++++++++++++++++++++++--------- src/or/or.h | 6 ++++- 4 files changed, 69 insertions(+), 17 deletions(-)