From bb9d5db9694647dd9394cf4885b8e90699632c5a Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Mon, 8 Feb 2016 15:03:44 +0100
Subject: [PATCH 1/2] Check for handshake expiration before attempting replace

---
 util/src/network/host.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/util/src/network/host.rs b/util/src/network/host.rs
index 24c3460db..50cf294bc 100644
--- a/util/src/network/host.rs
+++ b/util/src/network/host.rs
@@ -599,6 +599,9 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
 
 	fn start_session(&self, token: StreamToken, io: &IoContext<NetworkIoMessage<Message>>) {
 		let mut connections = self.connections.write().unwrap();
+		if connections.get(token).is_none() {
+			return; // handshake expired
+		}
 		connections.replace_with(token, |c| {
 			match Arc::try_unwrap(c).ok().unwrap().into_inner().unwrap() {
 				ConnectionEntry::Handshake(h) => {

From 2cf7734897016f267c07b08aa8901030d80ab8e1 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Mon, 8 Feb 2016 15:54:13 +0100
Subject: [PATCH 2/2] Enable travis build for beta branch

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 227853669..cb3067056 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ branches:
   - master
   - /^beta-.*$/
   - /^stable-.*$/
+  - /^beta$/
+  - /^stable$/
 matrix:
   fast_finish: true
   include: