diff -r 000000000000 -r 6474c204b198 mobile/android/base/sync/net/TLSSocketFactory.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/base/sync/net/TLSSocketFactory.java	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,70 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko.sync.net;
+
+import java.io.IOException;
+import java.net.Socket;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocket;
+
+import org.mozilla.gecko.background.common.log.Logger;
+
+import ch.boye.httpclientandroidlib.conn.ssl.SSLSocketFactory;
+import ch.boye.httpclientandroidlib.params.HttpParams;
+
+public class TLSSocketFactory extends SSLSocketFactory {
+  private static final String LOG_TAG = "TLSSocketFactory";
+  private static final String[] DEFAULT_CIPHER_SUITES = new String[] {
+    "TLS_DHE_RSA_WITH_AES_256_CBC_SHA",
+    "TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
+    "SSL_RSA_WITH_RC4_128_SHA", // "RC4_SHA"
+  };
+  private static final String[] DEFAULT_PROTOCOLS = new String[] {
+    "SSLv3",
+    "TLSv1"
+  };
+
+  // Guarded by `this`.
+  private static String[] cipherSuites = DEFAULT_CIPHER_SUITES;
+
+  public TLSSocketFactory(SSLContext sslContext) {
+    super(sslContext);
+  }
+
+  /**
+   * Attempt to specify the cipher suites to use for a connection. If
+   * setting fails (as it will on Android 2.2, because the wrong names
+   * are in use to specify ciphers), attempt to set the defaults.
+   *
+   * We store the list of cipher suites in `cipherSuites`, which
+   * avoids this fallback handling having to be executed more than once.
+   *
+   * This method is synchronized to ensure correct use of that member.
+   *
+   * See Bug 717691 for more details.
+   *
+   * @param socket
+   *        The SSLSocket on which to operate.
+   */
+  public static synchronized void setEnabledCipherSuites(SSLSocket socket) {
+    try {
+      socket.setEnabledCipherSuites(cipherSuites);
+    } catch (IllegalArgumentException e) {
+      cipherSuites = socket.getSupportedCipherSuites();
+      Logger.warn(LOG_TAG, "Setting enabled cipher suites failed: " + e.getMessage());
+      Logger.warn(LOG_TAG, "Using " + cipherSuites.length + " supported suites.");
+      socket.setEnabledCipherSuites(cipherSuites);
+    }
+  }
+
+  @Override
+  public Socket createSocket(HttpParams params) throws IOException {
+    SSLSocket socket = (SSLSocket) super.createSocket(params);
+    socket.setEnabledProtocols(DEFAULT_PROTOCOLS);
+    setEnabledCipherSuites(socket);
+    return socket;
+  }
+}