Merge branch 0.21.1 into master (#3610)

* Updating changelog for 0.21.1 release

* Releasing 0.21.1

Co-authored-by: Emily Morehouse <emily@cuttlesoft.com>

CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+### 0.21.1 (December 21, 2020)
+
+Fixes and Functionality:
+
+- Hotfix: Prevent SSRF (#3410)
+- Protocol not parsed when setting proxy config from env vars (#3070)
+- Updating axios in types to be lower case (#2797)
+- Adding a type guard for `AxiosError` (#2949)
+
+Internal and Tests:
+
+- Remove the skipping of the `socket` http test (#3364)
+- Use different socket for Win32 test (#3375)
+
+Huge thanks to everyone who contributed to this release via code (authors listed below) or via reviews and triaging on GitHub:
+
+- Daniel Lopretto <timemachine3030@users.noreply.github.com>
+- Jason Kwok <JasonHK@users.noreply.github.com>
+- Jay <jasonsaayman@gmail.com>
+- Jonathan Foster <jonathan@jonathanfoster.io>
+- Remco Haszing <remcohaszing@gmail.com>
+- Xianming Zhong <chinesedfan@qq.com>
+
 ### 0.21.0 (October 23, 2020)
 
 Fixes and Functionality:

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "axios",
   "main": "./dist/axios.js",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "homepage": "https://github.com/axios/axios",
   "authors": [
     "Matt Zabriskie"

dist/axios.js

@@ -1,4 +1,4 @@
-/* axios v0.21.0 | (c) 2020 by Matt Zabriskie */
+/* axios v0.21.1 | (c) 2020 by Matt Zabriskie */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -110,6 +110,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	};
 	axios.spread = __webpack_require__(25);
 	
+	// Expose isAxiosError
+	axios.isAxiosError = __webpack_require__(26);
+	
 	module.exports = axios;
 	
 	// Allow use of default import syntax in TypeScript
@@ -1729,6 +1732,23 @@ return /******/ (function(modules) { // webpackBootstrap
 	};
 
 
+/***/ }),
+/* 26 */
+/***/ (function(module, exports) {
+
+	'use strict';
+	
+	/**
+	 * Determines whether the payload is an error thrown by Axios
+	 *
+	 * @param {*} payload The value to test
+	 * @returns {boolean} True if the payload is an error thrown by Axios, otherwise false
+	 */
+	module.exports = function isAxiosError(payload) {
+	  return (typeof payload === 'object') && (payload.isAxiosError === true);
+	};
+
+
 /***/ })
 /******/ ])
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "axios",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "description": "Promise based HTTP client for the browser and node.js",
   "main": "index.js",
   "scripts": {