Updating the file for the patch on macbook#2

saranshisatgit wants to merge 2 commits intofjahr:masterfjahr/debugging_bitcoin:masterfrom

saranshisatgit:mastersaranshisatgit/debugging_bitcoin:masterCopy head branch name to clipboard