Merge branch 'feature3049-v2' into maint-0.2.2

Conflicts:
	src/common/Makefile.am

diff --cc src/common/Makefile.am
index 2d009bd4fa50646164c1ee3793b9942f0aec94b4,88892455e7b9f43999f28ea680dda7757a2837c7..6952591d67037759701841a1d490c80c266e3e8f
--- 1/src/common/Makefile.am
--- 2/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 \

diff --cc src/common/compat.h
Simple merge

diff --cc src/common/util.c
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/connection.c
Simple merge

diff --cc src/or/control.c
Simple merge

diff --cc src/or/control.h
Simple merge

diff --cc src/or/or.h
Simple merge