From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 23 May 2011 05:19:04 +0000 (-0400)
Subject: Merge branch 'feature3049-v2' into maint-0.2.2
X-Git-Tag: tor-0.2.3.2-alpha~102^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b80a8bba199b9adfb9c893641ba770566fa548e1;p=thirdparty%2Ftor.git

Merge branch 'feature3049-v2' into maint-0.2.2

Conflicts:
	src/common/Makefile.am
---

b80a8bba199b9adfb9c893641ba770566fa548e1
diff --cc src/common/Makefile.am
index 2d009bd4fa,88892455e7..6952591d67
--- 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 \