Merge version 9.20.1~dfsg.1-4+rpi2+deb7u2 and 9.20.1~dfsg.1-4+deb7u3 to produce 9.20.1~dfsg.1-4+rpi2+deb7u3
p7zip (9.20.1~dfsg.1-4+deb7u2) wheezy-security; urgency=high
* Non-maintainer upload by the LTS team.
* Fix the heap buffer overflow in UDF handler (CVS-2016-2335) using patches
from https://sourceforge.net/p/p7zip/discussion/383043/thread/
9d0fb86b/
(closes: #824160).
[dgit import package p7zip 9.20.1~dfsg.1-4+deb7u2]