mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-30 15:43:32 +01:00
Merge remote-tracking branch 'origin/maint-0.2.6'
This commit is contained in:
commit
4ced3b59aa
@ -1,3 +0,0 @@
|
|||||||
o Minor bugfixes (compilation):
|
|
||||||
- Add missing dependencies to fix compilation on BSD. Patch from
|
|
||||||
Peter Palfrader. Fixes bug 15127; bugfix on 0.2.5.1-alpha.
|
|
@ -146,5 +146,4 @@ src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(COMMONHEA
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
src/common/util_codedigest.o: src/common/common_sha1.i
|
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
|
|
||||||
|
|
||||||
|
@ -190,7 +190,6 @@ ORHEADERS = \
|
|||||||
noinst_HEADERS+= $(ORHEADERS) micro-revision.i
|
noinst_HEADERS+= $(ORHEADERS) micro-revision.i
|
||||||
|
|
||||||
src/or/config_codedigest.o: src/or/or_sha1.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
|
micro-revision.i: FORCE
|
||||||
@rm -f micro-revision.tmp; \
|
@rm -f micro-revision.tmp; \
|
||||||
|
Loading…
Reference in New Issue
Block a user