From c4962abc9b5940cdd3bed920b19334fd269df31b Mon Sep 17 00:00:00 2001
From: Mike DePaulo <mikedep333@gmail.com>
Date: Sat, 18 Oct 2014 19:59:47 -0400
Subject: Update openssl to version openssl-1.0.1j

Conflicts:
	openssl/Makefile
	openssl/crypto/opensslconf.h
---
 packages.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages.txt')

diff --git a/packages.txt b/packages.txt
index 01efc6b32..c60cd9f11 100644
--- a/packages.txt
+++ b/packages.txt
@@ -66,7 +66,7 @@ libxcb git version
 libxkbfile-1.0.8
 mesa git version
 mkfontscale git version
-openssl-1.0.1i
+openssl-1.0.1j
 pixman git version
 presentproto-1.0
 pthreads-w32 cvs version
-- 
cgit v1.2.3