summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-11-19 10:18:57 -0500
committerNick Mathewson <nickm@torproject.org>2018-11-19 10:18:57 -0500
commit8183640ada0ccef0c1f123a312b99c87269a1cae (patch)
tree980a9bfed39e36b28ed819304c334bfd4b256f35
parenta8df39e9552bd679b35513fa4a1c98507e870082 (diff)
parent3260914db06acd5a8a0b4f0e5991f8e318190dce (diff)
downloadtor-8183640ada0ccef0c1f123a312b99c87269a1cae.tar.gz
tor-8183640ada0ccef0c1f123a312b99c87269a1cae.zip
Merge branch 'maint-0.3.5'
-rw-r--r--changes/bug284853
-rw-r--r--src/tools/include.am2
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug28485 b/changes/bug28485
new file mode 100644
index 0000000000..a8309ae21f
--- /dev/null
+++ b/changes/bug28485
@@ -0,0 +1,3 @@
+ o Minor bugfixes (compilation):
+ - Add missing dependency on libgdi32.dll for tor-print-ed-signing-cert.exe
+ on Windows. Fixes bug 28485; bugfix on 0.3.5.1-alpha.
diff --git a/src/tools/include.am b/src/tools/include.am
index 73ec86935f..f7aa7e0d1e 100644
--- a/src/tools/include.am
+++ b/src/tools/include.am
@@ -41,7 +41,7 @@ src_tools_tor_print_ed_signing_cert_LDADD = \
$(TOR_CRYPTO_LIBS) \
$(TOR_UTIL_LIBS) \
@TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \
- @TOR_LIB_WS32@ @TOR_LIB_USERENV@
+ @TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_GDI@
if USE_NSS
# ...