diff options
author | Nick Mathewson <nickm@torproject.org> | 2015-03-04 12:15:10 +0100 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-03-04 12:15:10 +0100 |
commit | 6a8550fa3c1a435a5c6d3759b893b10f1899e570 (patch) | |
tree | 0622523a85a361fa5ab7313e189f8ce7a4a7f51e /src/common | |
parent | a1bdb6e42cea6b2a7b6f5dfb937752f9fd997599 (diff) | |
parent | 5ad47aafabfdb9718b4beb7c3893af58a9147e2e (diff) | |
download | tor-6a8550fa3c1a435a5c6d3759b893b10f1899e570.tar.gz tor-6a8550fa3c1a435a5c6d3759b893b10f1899e570.zip |
Merge remote-tracking branch 'origin/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 |