Merge branch 'master' of https://github.com/agl/pond
Merge branch 'master' of https://github.com/agl/pond
Merge branch 'master' of github.com:burdges/pond
Revert "Note that golang from Ubuntu 14.04 is too old."

This reverts commit f4e441c77a2039814046ff8219629c547fe8b689.
Merge branch 'master' of https://github.com/agl/pond
Detect tor port even in developer mode so that PANDA can run properly under TBB.  There was an issue because PANDA runs over tor even in developer mode, but TBB uses port 9150 rather than the default tor port 9050.

Allow tor to be used by PANDA when running in developer mode

Oops
Revert "Revert "Note that golang from Ubuntu 14.04 is too old.""

This reverts commit 70e4ce9555e4953356b65582cfab1876ac6fee10.
Plumb ratchet error messages to the user.

This change causes error messages from the ratchet code to be surfaces
to the user in the contact log. This is to help debug #124.
Note that golang from Ubuntu 14.04 is too old.

When installing on Ubuntu 14.04, Go 1.3 will need to be installed from
source since Ubuntu's is too old now. (Noted in #123.)

See https://golang.org/doc/go1.3#cgo for details of the changes.
Revert "Note that golang from Ubuntu 14.04 is too old."

This reverts commit f4e441c77a2039814046ff8219629c547fe8b689.
Fix crash when deleting home server message.

Fixes #131.
Detect tor port even in developer mode so that PANDA can run properly under TBB.  There was an issue because PANDA runs over tor even in developer mode, but TBB uses port 9150 rather than the default tor port 9050.

Allow tor to be used by PANDA when running in developer mode

Oops
Revert "Revert "Note that golang from Ubuntu 14.04 is too old.""

This reverts commit 70e4ce9555e4953356b65582cfab1876ac6fee10.
Merge branch 'master' of github.com:burdges/pond
Merge branch 'master' into rename_contacts