Merge pull request #2406 from obscuren/release/1.3.6

Release/1.3.6
This commit is contained in:
Jeffrey Wilcke 2016-04-01 12:51:33 +02:00
commit 9e323d65b2
3 changed files with 4 additions and 3 deletions

View file

@ -1 +1 @@
1.3.5 1.3.6

View file

@ -48,10 +48,10 @@ import (
const ( const (
ClientIdentifier = "Geth" ClientIdentifier = "Geth"
Version = "1.3.5" Version = "1.3.6"
VersionMajor = 1 VersionMajor = 1
VersionMinor = 3 VersionMinor = 3
VersionPatch = 5 VersionPatch = 6
) )
var ( var (

View file

@ -91,6 +91,7 @@ func PromptPassword(prompt string, warnTerm bool) (string, error) {
} }
fmt.Print(prompt) fmt.Print(prompt)
input, err := bufio.NewReader(os.Stdin).ReadString('\n') input, err := bufio.NewReader(os.Stdin).ReadString('\n')
input = strings.TrimRight(input, "\r\n")
fmt.Println() fmt.Println()
return input, err return input, err
} }