Merge pull request #143 from rod-hynes/master

Fix: wrong value used when capping polling frequency

psiphon/meekConn.go

@@ -451,7 +451,7 @@ func (meek *MeekConn) relay() {
 		} else {
 			interval = time.Duration(float64(interval) * POLL_INTERNAL_MULTIPLIER)
 			if interval >= MAX_POLL_INTERVAL {
-				interval = MIN_POLL_INTERVAL
+				interval = MAX_POLL_INTERVAL
 			}
 		}
 	}