diff options
author | Nick Mathewson <nickm@torproject.org> | 2015-03-04 12:14:17 +0100 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-03-04 12:14:17 +0100 |
commit | 5ad47aafabfdb9718b4beb7c3893af58a9147e2e (patch) | |
tree | b65c96b62b5e876584afdd31b41c9cd906fcf261 /src/common | |
parent | 2d926d0147af8c632fe389e770c5832009f2ddc0 (diff) | |
parent | 930ab95e1fb0dfd5af35e7d84ca58ff21b65a605 (diff) | |
download | tor-5ad47aafabfdb9718b4beb7c3893af58a9147e2e.tar.gz tor-5ad47aafabfdb9718b4beb7c3893af58a9147e2e.zip |
Merge remote-tracking branch 'public/bug15127_025' into maint-0.2.6
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/include.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/include.am b/src/common/include.am index 5b63392541..a642f7a79c 100644 --- a/src/common/include.am +++ b/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 |