[Pkg-privacy-commits] [vidalia] 132/160: Merge tag 'debian/0.2.20-2' into debian-master

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository vidalia.

commit 316995f85bf5c87704ca7e480005f5a64f978ea7
Merge: 12ed215 f89f989
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Feb 2 17:26:32 2013 +0100

    Merge tag 'debian/0.2.20-2' into debian-master
    
    Debian release 0.2.20-2
    
    Conflicts:
    	debian/changelog

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

diff --cc debian/changelog
index 52b877b,69ed74a..45d30de
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,15 +1,35 @@@
 +vidalia (0.2.21-1) unstable; urgency=low
 +
++  [ Ulises Vitulli ]
 +  * New upstream release, fixes several bugs:
 +    - Avoid waiting to reload router list if ns/all returned empty.
 +    - Stop trying to load router information if torControl is not connected.
 +    - Fix RouterDescriptor's bandwidth and uptime values when defined from the
 +      consensus.
 +    - Save ControlPortWriteToFile using relative path.
 +  * Updated Debconf template translations:
 +    - Italian, thanks Fabio Pirola (Closes: #699082).
 +  * Updated Standard-version to 3.9.4 (no changes needed).
 +
++  [ intrigeri ]
++  * Drop the patches that were taken from upstream 0.2.21:
++    - Fix-wrong-uptime-bandwidth-in-relay-list.patch
++    - Populate-the-relay-list-at-startup.patch
++
 + -- Ulises Vitulli <dererk at debian.org>  Sun, 27 Jan 2013 10:27:17 -0300
 +
+ vidalia (0.2.20-2) unstable; urgency=low
+ 
+   * New patches cherry-picked from upstream 0.2.21:
+     - Fix-wrong-uptime-bandwidth-in-relay-list.patch (Closes: #699178)
+       This is upstream commit b3d4f7f with the changes/* file removed.
+     - Populate-the-relay-list-at-startup.patch (Closes: #699179)
+       This is taken from upstream commit b00f51dc, but with the fix for
+       upstream Trac#6482 (that doesn't seem worth a freeze exception) and
+       the changes/* file removed.
+ 
+  -- intrigeri <intrigeri at debian.org>  Sat, 02 Feb 2013 17:02:01 +0100
+ 
  vidalia (0.2.20-1) unstable; urgency=low
  
    [ Ulises Vitulli ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git