From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Tue, 8 Apr 2014 01:21:14 +0000 (-0700)
Subject: Merge branch 'vendor/OPENSSL'
X-Git-Tag: v3.9.0~204
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/a29ef164df4db4a1f40d00c14edcffee86151c65

Merge branch 'vendor/OPENSSL'
---

a29ef164df4db4a1f40d00c14edcffee86151c65
diff --cc crypto/openssl/crypto/bn/asm/x86_64-mont5.pl
index 8f8dc5a597,dae0fe2453..dae0fe2453
mode 100644,100755..100644
--- a/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl
+++ b/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl