Merge remote-tracking branch 'public/17826_redux'

This commit is contained in:
Nick Mathewson
2016-01-07 09:52:09 -08:00
3 changed files with 13 additions and 2 deletions
+4 -1
View File
@@ -78,7 +78,10 @@ LIBOR_A_SOURCES = \
$(threads_impl_source) \
$(readpassphrase_source)
src/common/log.o: micro-revision.i
src/common/src_common_libor_testing_a-log.o \
src/common/src_common_libor_testing_a-log.obj \
src/common/log.o \
src/common/log.obj : micro-revision.i
LIBOR_CRYPTO_A_SOURCES = \
src/common/aes.c \