On Tue, 20 Aug 2013 10:43:57 -0500, Tim Peters <tim.pet...@gmail.com> wrote: > [Tim] > >> > hg log -r 3.2 > >> changeset: 83826:b9b521efeba3 > >> branch: 3.2 > >> parent: 83739:6255b40c6a61 > >> user: Antoine Pitrou <solip...@pitrou.net> > >> date: Sat May 18 17:56:42 2013 +0200 > >> summary: Issue #17980: Fix possible abuse of ssl.match_hostname() > >> for denial of service using certificates with many wildcards > >> (CVE-2013-2099). > > [Antoine] > > Oops, that's me :-S > > Now I don't remember if I omitted to merge deliberately, or if that was > > an oversight. > > Well, yours is just the tip of the 3.2 branch. 3.2 was already active > when you made this commit, left over from the 3.2.5 release fiddling > (when, presumably, a merge to default was also skipped):
Georg indicated at the time that not merging was intentional. --David _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
