OS merges

Summary:
All pretty trivial:

https://github.com/facebook/folly/issues/99
https://github.com/facebook/folly/issues/98
https://github.com/facebook/folly/issues/45

Test Plan: Will watch jenkins fbthrift build

Reviewed By: dcsommer@fb.com

Subscribers: doug, njormrod, folly-diffs@

FB internal diff: D1669952

Signature: t1:1669952:1415643677:906234f0a89f38645b0072d3c88762d8fa2729dc

diff --git a/README b/README
index 1c3b00c5754ecd2f4995e13e3159891c7e838360..496f2af6e0f4a30981d5b6eb0b3a16ac8922267f 100644 (file)
--- a/README
+++ b/README
@@ -42,7 +42,8 @@ sudo apt-get install \
     make \
     zlib1g-dev \
     binutils-dev \
-    libjemalloc-dev
+    libjemalloc-dev \
+    libssl-dev
 
 Ubuntu 14.04 LTS
 ----------------