From 6360cbb001dc73a11c39e752aaf1fcd5fbf6504f Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 31 Mar 2010 22:03:34 +0200
Subject: cherry pick -r 1984..1985 lp:~donkult/apt/sid

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 375ef6151..5eaafffb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ apt (0.7.25.3ubuntu5) UNRELEASED; urgency=low
   * cmdline/apt-get.cc:
     - try version match in FindSrc first exact than fuzzy (LP: #551178)
 
+  [ Jean-Baptiste Lallement ]
+  * apt-pkg/contrib/strutl.cc:
+    - always escape '%' (LP: #130289) (Closes: #500560)
+    - unescape '%' sequence only if followed by 2 hex digit
+    - username/password are urlencoded in proxy string (RFC 3986)
+
  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 31 Mar 2010 21:59:42 +0200
 
 apt (0.7.25.3ubuntu4) lucid; urgency=low
-- 
cgit v1.2.3