        break;
      }
    }
- 
-+  return;
-+
-   // If we're doing DTLS-SRTP, now is the time.
-   if (!was_ever_writable_ && ShouldSetupDtlsSrtp()) {
-     if (!SetupDtlsSrtp(false)) {
-@@ -758,7 +787,7 @@
+@@ -758,7 +785,7 @@
  }
  
  bool BaseChannel::ShouldSetupDtlsSrtp() const {

--- talk/session/media/channel.cc	2014-11-13 15:44:57.000000000 -0800
+++ ../../src/webrtc/channel.cc	2014-11-13 15:48:16.000000000 -0800
@@ -39,6 +39,14 @@
 #include "webrtc/base/common.h"
 #include "webrtc/base/dscp.h"

 void BaseChannel::ChannelWritable_w() {
   ASSERT(worker_thread_ == rtc::Thread::Current());
   if (writable_)
@@ -707,6 +733,7 @@
     if (it->best_connection) {
       LOG(LS_INFO) << "Using " << it->local_candidate.ToSensitiveString()
                    << "->" << it->remote_candidate.ToSensitiveString();
