Fixed issues created when merging 0.26.1

lib/adapters/http.js

@@ -11,7 +11,7 @@ var httpsFollow = require('follow-redirects').https;
 var url = require('url');
 var zlib = require('zlib');
 var VERSION = require('./../env/data').version;
-var defaults = require('../defaults');
+var transitionalDefaults = require('../defaults/transitional');
 var AxiosError = require('../core/AxiosError');
 var CanceledError = require('../cancel/CanceledError');
 
@@ -380,7 +380,7 @@ module.exports = function httpAdapter(config) {
       // ClientRequest.setTimeout will be fired on the specify milliseconds, and can make sure that abort() will be fired after connect.
       req.setTimeout(timeout, function handleRequestTimeout() {
         req.abort();
-        var transitional = config.transitional || defaults.transitional;
+        var transitional = config.transitional || transitionalDefaults;
         reject(new AxiosError(
           'timeout of ' + timeout + 'ms exceeded',
           transitional.clarifyTimeoutError ? AxiosError.ETIMEDOUT : AxiosError.ECONNABORTED,

lib/env/data.js

@@ -1,3 +1,3 @@
 module.exports = {
-  "version": "0.26.0"
+  "version": "0.26.1"
 };