From 3bf017270aaac7ddad1f4b2a96121425c41b310d Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@python.org>
Date: Mon, 14 May 2018 17:53:03 -0400
Subject: [PATCH] bpo-33497: Add NEWS and ACKS entries.

---
 Misc/ACKS                                                       | 1 +
 .../next/Library/2018-05-14-17-49-34.bpo-33497.wWT6XM.rst       | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 Misc/NEWS.d/next/Library/2018-05-14-17-49-34.bpo-33497.wWT6XM.rst

diff --git a/Misc/ACKS b/Misc/ACKS
index 587bbecbc36a3a0..665b4dd7f43fb53 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -207,6 +207,7 @@ Ammar Brohi
 Josh Bronson
 Daniel Brotsky
 Jean Brouwers
+Amber Brown
 Gary S. Brown
 Titus Brown
 Oleg Broytmann
diff --git a/Misc/NEWS.d/next/Library/2018-05-14-17-49-34.bpo-33497.wWT6XM.rst b/Misc/NEWS.d/next/Library/2018-05-14-17-49-34.bpo-33497.wWT6XM.rst
new file mode 100644
index 000000000000000..d919dfdca75e432
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-05-14-17-49-34.bpo-33497.wWT6XM.rst
@@ -0,0 +1,2 @@
+Add errors param to cgi.parse_multipart and make an encoding in FieldStorage
+use the given errors (needed for Twisted).  Patch by Amber Brown.