[tor-commits] [tor/master] Merge branch 'move_contrib_source' of git://git.torproject.org/nickm/tor

[andrea at torproject.org]

commit 3a33b1fe3bd7ba4cb1fff73f97ee722a2b127db5
Merge: a45760b 63f542a
Author: Andrea Shepard <andrea at persephoneslair.org>
Date:   Thu Oct 11 15:55:26 2012 -0700

    Merge branch 'move_contrib_source' of git://git.torproject.org/nickm/tor

 changes/src_ext                   |    3 +
 src/common/OpenBSD_malloc_Linux.c | 2057 ----------------------
 src/common/ht.h                   |  490 ------
 src/common/include.am             |    3 +-
 src/ext/OpenBSD_malloc_Linux.c    | 2057 ++++++++++++++++++++++
 src/ext/eventdns.c                | 3505 +++++++++++++++++++++++++++++++++++++
 src/ext/eventdns.h                |  337 ++++
 src/ext/ht.h                      |  490 ++++++
 src/ext/include.am                |   12 +
 src/ext/tinytest.c                |  387 ++++
 src/ext/tinytest.h                |   87 +
 src/ext/tinytest_demo.c           |  215 +++
 src/ext/tinytest_macros.h         |  184 ++
 src/include.am                    |    3 +-
 src/or/eventdns.c                 | 3505 -------------------------------------
 src/or/eventdns.h                 |  337 ----
 src/or/include.am                 |    3 +-
 src/test/include.am               |    7 +-
 src/test/tinytest.c               |  387 ----
 src/test/tinytest.h               |   87 -
 src/test/tinytest_demo.c          |  215 ---
 src/test/tinytest_macros.h        |  184 --
 22 files changed, 7283 insertions(+), 7272 deletions(-)