Merge "Make a VirtualRESTService class for Parsoid"

diff --cc autoload.php
Simple merge

diff --cc includes/libs/MultiHttpClient.php
index eeda8d4,8d9e810..fb2daa6
--- 1/includes/libs/MultiHttpClient.php
--- 2/includes/libs/MultiHttpClient.php
+++ b/includes/libs/MultiHttpClient.php
@@@ -57,9 -60,9 +60,10 @@@ class MultiHttpClient 
         * @param array $options
         *   - connTimeout     : default connection timeout
         *   - reqTimeout      : default request timeout
+        *   - proxy           : HTTP proxy to use
         *   - usePipelining   : whether to use HTTP pipelining if possible (for all hosts)
         *   - maxConnsPerHost : maximum number of concurrent connections (per host)
 +       * @throws Exception
         */
        public function __construct( array $options ) {
                if ( isset( $options['caBundlePath'] ) ) {