commit 4aa0aa0300ca9ff4e65ff32eae0db7db4fe24c3d Merge: 6145229 8ce6722 Author: Nick Mathewson nickm@torproject.org Date: Sun Feb 12 23:27:31 2012 -0500

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

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

changes/bug5065 | 5 +++++ src/common/Makefile.am | 4 ++-- src/or/Makefile.am | 8 ++++---- 3 files changed, 11 insertions(+), 6 deletions(-)

diff --cc src/common/Makefile.am index 04c4115,6da1782..5e76842 --- a/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 57f5dd6,4f4e9c9..3cc789a --- a/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; \