commit 77c04c2fec9937fe4b9ff1b0ba0f4289ea12f165 Merge: 3a7183e 656f95d Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 14 12:00:11 2011 -0400

Merge remote-tracking branch 'asn-http/bug3551'

src/main.c | 12 +++++------- src/protocols/dummy.c | 4 ++-- src/protocols/obfs2.c | 8 ++++---- src/socks.c | 16 +++++----------- src/socks.h | 12 +++++------- src/test/unittest_obfs2.c | 2 +- src/test/unittest_socks.c | 18 ++++++------------ src/util.c | 18 ++++++++++-------- 8 files changed, 38 insertions(+), 52 deletions(-)