From: David Lord <davidism@gmail.com>
Date: Sat, 6 Apr 2019 20:12:56 +0000 (-0700)
Subject: Merge branch '2.10.x'
X-Git-Tag: 2.11.0~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F798%2Fhead;p=thirdparty%2Fjinja.git

Merge branch '2.10.x'
---

fd89fed7456e755e33ba70674c41be5ab222e193
diff --cc CHANGES.rst
index d7e88faa,28f32781..a41b887d
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@@ -4,20 -2,16 +4,30 @@@ Jinja Changelo
  ===============
  
  
 +Version 2.11
 +------------
 +
 +unreleased
 +
 +- Async support is only loaded the first time an
 +  :class:`~environment.Environment` enables it, in order to avoid a
 +  slow initial import. (`#765`_)
 +- Python 2.6 and 3.3 are not supported anymore.
 +- The `map` filter in async mode now automatically awaits
 +
 +.. _#765: https://github.com/pallets/jinja/issues/765
 +
 +
+ Version 2.10.1
+ --------------
+ 
+ Released 2019-04-06
+ 
+ -   ``SandboxedEnvironment`` securely handles ``str.format_map`` in
+     order to prevent code execution through untrusted format strings.
+     The sandbox already handled ``str.format``.
+ 
+ 
  Version 2.10
  ------------