Merge remote-tracking branch 'public/bug15127_025' into maint-0.2.6

changes/bug15127

@@ -0,0 +1,3 @@
+  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.

src/common/include.am

@@ -146,4 +146,5 @@ 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
 

src/or/include.am

@@ -190,6 +190,7 @@ 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;				\