---- 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
+--- talk/session/media/channel.cc	2014-11-13 15:55:59.000000000 -0800
++++ ../../src/webrtc/channel.cc	2014-11-13 15:55:13.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,10 +733,13 @@
     if (it->best_connection) {
       LOG(LS_INFO) << "Using " << it->local_candidate.ToSensitiveString()
                    << "->" << it->remote_candidate.ToSensitiveString();

       break;
     }
   }
@@ -758,7 +785,7 @@
 }
 
 bool BaseChannel::ShouldSetupDtlsSrtp() const {
