Merge pull request #95 from samoht/master

Prepare the release
mirage · Sep 15, 2015 · b6f61d8 · b6f61d8
2 parents fd01629 + 5043d86
commit b6f61d8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,13 @@
+0.8.8 (2015-09-15)
+* Expose a new functor `Conduit_mirage.With_tcp` (#92, by @Drup)
+* Expose a new functor: `Resolver_mirage.Make_with_stack` to build a DNS
+  resolver using an existing network stack (#92, by @Drup)
+* Expose `Resolver_mirage.S`, the signature for Mirage's conduit resolvers than
+  can perform DNS lookups. These resolvers now expose their `DNS` implmentation
+  as a submodule (#92, by @Drup)
+* Expose a ?version arg in Conduit_async_ssl.ssl_listen, default being TLS 1.2
+  (#94, by @vbmithr)
+
 0.8.7 (2015-08-18):
 * Do not ignore custom context when calling `Conduit_lwt_unix_ssl.accept`
   (reported by @jrb467 in #88)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.8.7
+0.8.8
diff --git a/lib/conduit_async_ssl.mli b/lib/conduit_async_ssl.mli
@@ -30,7 +30,10 @@ val ssl_connect :
 
 (** [ssl_listen ~crt_file ~key_file rd wr] will establish a server
     TLS/SSL session over an existing pair of [rd] {!Reader.t} and
-    [wd] {!Writer.t} Async connections. *)
+    [wd] {!Writer.t} Async connections.
+
+    [version] is the version of SSL being used by the server. If not
+    set, it is [Ssl.Version.Tlsv1_2]. *)
 val ssl_listen :
   ?version:Ssl.Version.t ->
   crt_file:string ->