From 27cc412d79f429978016c32fb22bc61514c218a5 Mon Sep 17 00:00:00 2001
From: Jehiah Czebotar <jehiah@gmail.com>
Date: Thu, 23 Jun 2016 09:34:53 -0400
Subject: [PATCH 1/3] bump go-options dependency

---
 Godeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps b/Godeps
index b6bc08dd..32bb159c 100644
--- a/Godeps
+++ b/Godeps
@@ -1,7 +1,7 @@
 github.com/18F/hmacauth                  1.0.1
 github.com/BurntSushi/toml               3883ac1ce943878302255f538fce319d23226223
 github.com/bitly/go-simplejson           3378bdcb5cebedcbf8b5750edee28010f128fe24
-github.com/mreiferson/go-options         ee94b57f2fbf116075426f853e5abbcdfeca8b3d
+github.com/mreiferson/go-options         33795234b6f327f1be2d78a541893012362a4e06
 github.com/bmizerany/assert              e17e99893cb6509f428e1728281c2ad60a6b31e3
 gopkg.in/fsnotify.v1                     v1.2.0
 golang.org/x/oauth2                      397fe7649477ff2e8ced8fc0b2696f781e53745a

From 3bba24ab312746c8227c00b9a3b88a9eac3c1e11 Mon Sep 17 00:00:00 2001
From: Jehiah Czebotar <jehiah@gmail.com>
Date: Thu, 23 Jun 2016 09:35:33 -0400
Subject: [PATCH 2/3] Bump verison to 2.1

---
 README.md  | 2 +-
 version.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f33711f4..7c475fc7 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ to validate accounts by email, domain or group.
 
 ## Installation
 
-1. Download [Prebuilt Binary](https://github.com/bitly/oauth2_proxy/releases) (current release is `v2.0.1`) or build with `$ go get github.com/bitly/oauth2_proxy` which will put the binary in `$GOROOT/bin`
+1. Download [Prebuilt Binary](https://github.com/bitly/oauth2_proxy/releases) (current release is `v2.1`) or build with `$ go get github.com/bitly/oauth2_proxy` which will put the binary in `$GOROOT/bin`
 2. Select a Provider and Register an OAuth Application with a Provider
 3. Configure OAuth2 Proxy using config file, command line options, or environment variables
 4. Configure SSL or Deploy behind a SSL endpoint (example provided for Nginx)
diff --git a/version.go b/version.go
index 200dacbc..040efbd9 100644
--- a/version.go
+++ b/version.go
@@ -1,3 +1,3 @@
 package main
 
-const VERSION = "2.0.1"
+const VERSION = "2.1"

From 671f00e60eedc0df4796e1f81a9f410298d410fe Mon Sep 17 00:00:00 2001
From: Jehiah Czebotar <jehiah@gmail.com>
Date: Thu, 23 Jun 2016 09:42:32 -0400
Subject: [PATCH 3/3] cookie secret: give helper command for generating a
 secret

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 7c475fc7..9a0eb825 100644
--- a/README.md
+++ b/README.md
@@ -149,6 +149,8 @@ To authorize by email domain use `--email-domain=yourcompany.com`. To authorize
 
 `oauth2_proxy` can be configured via [config file](#config-file), [command line options](#command-line-options) or [environment variables](#environment-variables).
 
+To generate a strong cookie secret use `python -c 'import os,base64; print base64.b64encode(os.urandom(16))'`
+
 ### Config File
 
 An example [oauth2_proxy.cfg](contrib/oauth2_proxy.cfg.example) config file is in the contrib directory. It can be used by specifying `-config=/etc/oauth2_proxy.cfg`