From a2e1e5c6a0ab5bacafae4f0caa165bbcdf3c6b09 Mon Sep 17 00:00:00 2001
From: Ramesh Nair <ram@hiddentao.com>
Date: Wed, 23 Mar 2016 22:53:20 +0800
Subject: [PATCH 1/2] [release/1.3.6]: cmd/utils: removed password line endings
 when not using liner.

(cherry picked from commit 6f300344135894970bc417285c2f45f723cd3aa5)
---
 cmd/utils/cmd.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index 5cbb581244..3e00836e14 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -91,6 +91,7 @@ func PromptPassword(prompt string, warnTerm bool) (string, error) {
 	}
 	fmt.Print(prompt)
 	input, err := bufio.NewReader(os.Stdin).ReadString('\n')
+	input = strings.TrimRight(input, "\r\n")
 	fmt.Println()
 	return input, err
 }

From bf324bd24be9036046e36c6248b2d7c31cce9eca Mon Sep 17 00:00:00 2001
From: Jeffrey Wilcke <geffobscura@gmail.com>
Date: Fri, 1 Apr 2016 12:12:59 +0200
Subject: [PATCH 2/2] VERSION, cmd/geth: bumped version number 1.3.6

---
 VERSION          | 2 +-
 cmd/geth/main.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 80e78df683..95b25aee25 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.5
+1.3.6
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index dab2d8fc05..b6e835f31a 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -48,10 +48,10 @@ import (
 
 const (
 	ClientIdentifier = "Geth"
-	Version          = "1.3.5"
+	Version          = "1.3.6"
 	VersionMajor     = 1
 	VersionMinor     = 3
-	VersionPatch     = 5
+	VersionPatch     = 6
 )
 
 var (