diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-04 15:19:43 +0100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-04 15:19:43 +0100 |
| commit | 4ced3b59aad0fffd653869d486bb0f4b1c26b19f (patch) | |
| tree | 2130eb5815857acaaa124f2d85fb841175e5c3cd /src | |
| parent | 6ae9769b29330815c6c094ef43bafd6fa13b7626 (diff) | |
| parent | de2c5ad8150a9c111dd8f1dcfed1ceea132578f9 (diff) | |
| download | tor-4ced3b59aad0fffd653869d486bb0f4b1c26b19f.tar.gz tor-4ced3b59aad0fffd653869d486bb0f4b1c26b19f.zip | |
Merge remote-tracking branch 'origin/maint-0.2.6'
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/include.am | 1 | ||||
| -rw-r--r-- | src/or/include.am | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/common/include.am b/src/common/include.am index a642f7a79c..5b63392541 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -146,5 +146,4 @@ src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(COMMONHEA fi src/common/util_codedigest.o: src/common/common_sha1.i -src/common/src_common_libor_testing_a-util_codedigest.o: src/common/common_sha1.i diff --git a/src/or/include.am b/src/or/include.am index e257ceb8cc..b44e1099dc 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -190,7 +190,6 @@ ORHEADERS = \ noinst_HEADERS+= $(ORHEADERS) micro-revision.i src/or/config_codedigest.o: src/or/or_sha1.i -src/or/src_or_libtor_testing_a-config_codedigest.o: src/or/or_sha1.i micro-revision.i: FORCE @rm -f micro-revision.tmp; \ |