Merge branch 'release-1.17.96' into develop

* release-1.17.96:
  Bumping version to 1.17.96
  Add changelog entries from botocore

.changes/1.17.96.json

@@ -0,0 +1,22 @@
+[
+  {
+    "category": "``kms``", 
+    "description": "[``botocore``] Adds support for multi-Region keys", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``ec2``", 
+    "description": "[``botocore``] This release adds support for VLAN-tagged network traffic over an Elastic Network Interface (ENI). This feature is in limited Preview for this release. Contact your account manager if you are interested in this feature.", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``rds``", 
+    "description": "[``botocore``] This release enables fast cloning in Aurora Serverless. You can now clone between Aurora Serverless clusters and Aurora Provisioned clusters.", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``mediatailor``", 
+    "description": "[``botocore``] Adds AWS Secrets Manager Access Token Authentication for Source Locations", 
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+1.17.96
+=======
+
+* api-change:``kms``: [``botocore``] Adds support for multi-Region keys
+* api-change:``ec2``: [``botocore``] This release adds support for VLAN-tagged network traffic over an Elastic Network Interface (ENI). This feature is in limited Preview for this release. Contact your account manager if you are interested in this feature.
+* api-change:``rds``: [``botocore``] This release enables fast cloning in Aurora Serverless. You can now clone between Aurora Serverless clusters and Aurora Provisioned clusters.
+* api-change:``mediatailor``: [``botocore``] Adds AWS Secrets Manager Access Token Authentication for Source Locations
+
+
 1.17.95
 =======
 

boto3/__init__.py

@@ -18,7 +18,7 @@
 
 
 __author__ = 'Amazon Web Services'
-__version__ = '1.17.95'
+__version__ = '1.17.96'
 
 
 # The default Boto3 session; autoloaded when needed.

setup.cfg

@@ -3,6 +3,6 @@ universal = 1
 
 [metadata]
 requires_dist =
-    botocore>=1.20.95,<1.21.0
+    botocore>=1.20.96,<1.21.0
     jmespath>=0.7.1,<1.0.0
     s3transfer>=0.4.0,<0.5.0

setup.py

@@ -14,7 +14,7 @@
 
 
 requires = [
-    'botocore>=1.20.95,<1.21.0',
+    'botocore>=1.20.96,<1.21.0',
     'jmespath>=0.7.1,<1.0.0',
     's3transfer>=0.4.0,<0.5.0'
 ]