From a1e5f12c530ccf59434a7d59a34a049f160b3559 Mon Sep 17 00:00:00 2001
From: Nikolaus Rath <Nikolaus@rath.org>
Date: Sun, 3 Nov 2019 09:34:29 +0000
Subject: [PATCH] Released 3.6.0

---
 AUTHORS       | 6 ++++++
 ChangeLog.rst | 9 ++++++---
 meson.build   | 2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index bfece81c..c0ea0889 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,6 +25,7 @@ Clayton G. Hobbs <clay@lakeserv.net>
 Daniel Lublin <daniel@lublin.se>
 DrDaveD <2129743+DrDaveD@users.noreply.github.com>
 gala <gala132@users.noreply.github.com>
+Galen Getsov <4815620+ggetsov@users.noreply.github.com>
 George Vlahavas <vlahavas@gmail.com>
 G.raud Meyer <graud@gmx.com>
 harrim4n <git@harrim4n.com>
@@ -32,7 +33,10 @@ Jakub Jelen <jjelen@redhat.com>
 Josh Triplett <josh@joshtriplett.org>
 Julio Merino <jmmv@google.com>
 Julio Merino <jmmv@meroh.net>
+kalvdans <github@kalvdans.no-ip.org>
+Michael Forney <mforney@mforney.org>
 Mike Kelly <mike@pair.com>
+Mike Salvatore <mike.s.salvatore@gmail.com>
 Miklos Szeredi <miklos@szeredi.hu>
 Miklos Szeredi <mszeredi@suse.cz>
 mssalvatore <mike.s.salvatore@gmail.com>
@@ -46,7 +50,9 @@ Rian Hunter <rianhunter@users.noreply.github.com>
 Samuel Murray <samuel.murray@outlook.com>
 S. D. Cloudt <s.d.cloudt@student.tue.nl>
 smheidrich <smheidrich@weltenfunktion.de>
+sunwire <50745572+sunwire@users.noreply.github.com>
 Tim Harder <radhermit@gmail.com>
 Timo Savola <timo.savola@iki.fi>
 tpoindessous <thomas@poindessous.com>
+Viktor Szakats <vszakats@users.noreply.github.com>
 Zoltan Kuscsik <zoltan.kuscsik@linaro.org>
diff --git a/ChangeLog.rst b/ChangeLog.rst
index 16d75f79..cef97400 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,12 +1,15 @@
-Unreleased Changes
-------------------
+Release 3.6.0 (2019-11-03)
+--------------------------
 
 * Added "-o direct_io" option.
   This option disables the use of page cache in kernel.
   This is useful for example if the file size is not known before reading it.
   For example if you mount /proc dir from a remote host without the direct_io
   option, the read always will return zero bytes instead of actual data.
-  
+* Added --verbose option.
+* Fixed a number of compiler warnings.
+* Improved performance under OS X.
+
 
 Release 3.5.2 (2019-04-13)
 --------------------------
diff --git a/meson.build b/meson.build
index bd790a6c..362abd05 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('sshfs', 'c', version: '3.5.2',
+project('sshfs', 'c', version: '3.6.0',
         meson_version: '>= 0.40',
         default_options: [ 'buildtype=debugoptimized' ])