commit b80a8bba199b9adfb9c893641ba770566fa548e1 Merge: 1ba1bde 1e69c60 Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 23 01:19:04 2011 -0400 Merge branch 'feature3049-v2' into maint-0.2.2 Conflicts: src/common/Makefile.am changes/exit-policy-default-is-not-a-prefix | 5 + changes/feature3049 | 6 + src/common/Makefile.am | 4 +- src/common/compat.h | 2 +- src/common/compat_libevent.c | 2 +- src/common/log.c | 2 +- src/common/procmon.c | 332 +++++++++++++++++++++++++++ src/common/procmon.h | 30 +++ src/common/torlog.h | 1 - src/common/util.c | 18 +- src/or/config.c | 15 ++ src/or/connection.c | 3 +- src/or/control.c | 138 +++++++++++- src/or/control.h | 4 + src/or/or.h | 10 +- 15 files changed, 554 insertions(+), 18 deletions(-) diff --cc src/common/Makefile.am index 2d009bd,8889245..6952591 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@@ -12,11 -12,11 +12,11 @@@ libor_extra_source endif libor_a_SOURCES = address.c log.c util.c compat.c container.c mempool.c \ - memarea.c di_ops.c util_codedigest.c $(libor_extra_source) - memarea.c util_codedigest.c procmon.c $(libor_extra_source) ++ memarea.c di_ops.c procmon.c util_codedigest.c $(libor_extra_source) libor_crypto_a_SOURCES = crypto.c aes.c tortls.c torgzip.c libor_event_a_SOURCES = compat_libevent.c - noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h ciphers.inc compat_libevent.h tortls_states.h di_ops.h -noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h procmon.h ciphers.inc compat_libevent.h tortls_states.h ++noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h ciphers.inc compat_libevent.h tortls_states.h di_ops.h procmon.h common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) if test "@SHA1SUM@" != none; then \