commit f949faca8c0664400a50c30d2433408514938e4f Merge: b1e2ee5 8b198c9 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 9 02:31:45 2011 -0400

Merge remote-tracking branch 'asn/bug3359'

src/network.c | 12 ++++---- src/socks.c | 74 +++++++++++++++++++++++---------------------- src/socks.h | 13 ++++---- src/test/unittest_socks.c | 22 +++++++------- 4 files changed, 61 insertions(+), 60 deletions(-)