[tor-commits] [obfsproxy/master] Merge remote-tracking branch 'asn/bug3656'

[nickm at torproject.org]

commit b57ae5933f455bf6f1d1cb7c622ac0b5eb4c2730
Merge: e1a825f 80277d2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 9 13:01:39 2011 -0400

    Merge remote-tracking branch 'asn/bug3656'

 .gitignore                            |    1 +
 Makefile.am                           |   33 +-
 configure.ac                          |   28 +-
 src/container.c                       | 1441 +++++++++++++++++++++++++++++++++
 src/container.h                       |  683 ++++++++++++++++
 src/crypt.c                           |  115 ++--
 src/crypt.h                           |   18 +-
 src/external.c                        |   81 ++
 src/external.h                        |   10 +
 src/ht.h                              |  471 +++++++++++
 src/main.c                            |  364 +++------
 src/main.h                            |   10 +
 src/managed.c                         |  650 +++++++++++++++
 src/managed.h                         |   16 +
 src/network.c                         | 1036 ++++++++++++++++--------
 src/network.h                         |   97 ++-
 src/obfs_main.c                       |   16 +
 src/protocol.c                        |  209 ++++--
 src/protocol.h                        |  183 +++--
 src/protocols/dummy.c                 |  260 ++++---
 src/protocols/dummy.h                 |   42 +-
 src/protocols/obfs2.c                 |  493 ++++++------
 src/protocols/obfs2.h                 |   47 +-
 src/sha256.c                          |    6 +-
 src/sha256.h                          |    2 -
 src/socks.c                           |   61 +-
 src/socks.h                           |    6 +-
 src/test/integration_test/alpha       |   38 -
 src/test/integration_test/int_test.sh |   76 --
 src/test/test_socks_unsupported.py    |   18 -
 src/test/tester.py.in                 |  435 ++++++++++
 src/test/tinytest.c                   |   21 +-
 src/test/tinytest.h                   |    4 +
 src/test/tinytest_macros.h            |   21 +-
 src/test/unittest.c                   |   17 +-
 src/test/unittest_container.c         |  772 ++++++++++++++++++
 src/test/unittest_crypt.c             |  182 +++--
 src/test/unittest_dummy.c             |  203 +++++
 src/test/unittest_managed.c           |   64 ++
 src/test/unittest_obfs2.c             |  662 ++++++----------
 src/test/unittest_socks.c             |  438 +++++------
 src/util.c                            |  400 ++++++----
 src/util.h                            |  170 +++-
 43 files changed, 7552 insertions(+), 2348 deletions(-)