Merge remote-tracking branch 'origin/maint-0.2.2'

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

diff --cc src/common/Makefile.am
index 04c411556a0732520b1630a691bee04c82ddfc26,6da1782c8e4943dd14a0ec40e0f844c65ac736db..5e7684259a195b24082ef0a6908f5f957311bb76
--- 1/src/common/Makefile.am
--- 2/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@@ -55,9 -20,9 +55,9 @@@ noinst_HEADERS =                              
  
  common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)
        if test "@SHA1SUM@" != none; then \
-         (cd "$(srcdir)" && @SHA1SUM@ $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)) | @SED@ -n 's/^\(.*\)$$/"\1\\n"/p' > common_sha1.i; \
 -        "@SHA1SUM@" $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) | "@SED@" -n 's/^\(.*\)$$/"\1\\n"/p' > common_sha1.i; \
++        (cd "$(srcdir)" && "@SHA1SUM@" $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/^\(.*\)$$/"\1\\n"/p' > common_sha1.i; \
        elif test "@OPENSSL@" != none; then \
-         (cd "$(srcdir)" && @OPENSSL@ sha1 $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)) | @SED@ -n 's/SHA1(\(.*\))= \(.*\)/"\2  \1\\n"/p' > common_sha1.i; \
 -        "@OPENSSL@" sha1 $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) | "@SED@" -n 's/SHA1(\(.*\))= \(.*\)/"\2  \1\\n"/p' > common_sha1.i; \
++        (cd "$(srcdir)" && "@OPENSSL@" sha1 $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/SHA1(\(.*\))= \(.*\)/"\2  \1\\n"/p' > common_sha1.i; \
        else \
          rm common_sha1.i; \
          touch common_sha1.i; \

diff --cc src/or/Makefile.am
index 57f5dd65e4d70c5edec2b8987b72c0a1505870d2,4f4e9c97313cfe2761106834c128f602f9d78fce..3cc789a1befeb87d716a1f62fbf8cdb1cdd23600
--- 1/src/or/Makefile.am
--- 2/src/or/Makefile.am
+++ b/src/or/Makefile.am
@@@ -140,13 -72,11 +140,13 @@@ micro-revision.i: FORC
          mv micro-revision.tmp micro-revision.i;                       \
        fi; true
  
 -or_sha1.i: $(tor_SOURCES)
 +or_sha1.i: $(tor_SOURCES) $(libtor_a_SOURCES)
        if test "@SHA1SUM@" != none; then \
-         (cd "$(srcdir)" && @SHA1SUM@ $(tor_SOURCES) $(libtor_a_SOURCES)) | \
-         @SED@ -n 's/^\(.*\)$$/"\1\\n"/p' > or_sha1.i; \
 -        "@SHA1SUM@" $(tor_SOURCES) | "@SED@" -n 's/^\(.*\)$$/"\1\\n"/p' > or_sha1.i; \
++        (cd "$(srcdir)" && "@SHA1SUM@" $(tor_SOURCES) $(libtor_a_SOURCES)) | \
++        "@SED@" -n 's/^\(.*\)$$/"\1\\n"/p' > or_sha1.i; \
        elif test "@OPENSSL@" != none; then \
-         (cd "$(srcdir)" && @OPENSSL@ sha1 $(tor_SOURCES) $(libtor_a_SOURCES)) | \
-         @SED@ -n 's/SHA1(\(.*\))= \(.*\)/"\2  \1\\n"/p' > or_sha1.i; \
 -        "@OPENSSL@" sha1 $(tor_SOURCES) | "@SED@" -n 's/SHA1(\(.*\))= \(.*\)/"\2  \1\\n"/p' > or_sha1.i; \
++        (cd "$(srcdir)" && "@OPENSSL@" sha1 $(tor_SOURCES) $(libtor_a_SOURCES)) | \
++        "@SED@" -n 's/SHA1(\(.*\))= \(.*\)/"\2  \1\\n"/p' > or_sha1.i; \
        else \
          rm or_sha1.i; \
          touch or_sha1.i; \