[Pkg-privacy-commits] [vidalia] 116/160: Append-router-status-information-if-Tor-is-using-mic.patch: new patch, cherry-picked from upstream (Closes: #680489).

[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 ef03354d443da66f70ea87398475d77c21c9dec4
Author: intrigeri <intrigeri at boum.org>
Date:   Fri Jul 6 23:02:33 2012 +0200

    Append-router-status-information-if-Tor-is-using-mic.patch: new patch, cherry-picked from upstream (Closes: #680489).
---
 ...er-status-information-if-Tor-is-using-mic.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 31 insertions(+)

diff --git a/debian/patches/Append-router-status-information-if-Tor-is-using-mic.patch b/debian/patches/Append-router-status-information-if-Tor-is-using-mic.patch
new file mode 100644
index 0000000..a803382
--- /dev/null
+++ b/debian/patches/Append-router-status-information-if-Tor-is-using-mic.patch
@@ -0,0 +1,30 @@
+From: Tomás Touceda <chiiph at torproject.org>
+Subject: Append router status information if Tor is using microdescriptors
+Last-Update: Fri, 6 Jul 2012 17:55:29 -0300
+Applied-Upstream: 579b685ed19957d63989c0bf3a35b8f228f5e052
+
+---
+ src/vidalia/network/NetViewer.cpp |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp
+index 535c127..1d48b96 100644
+--- a/src/vidalia/network/NetViewer.cpp
++++ b/src/vidalia/network/NetViewer.cpp
+@@ -313,11 +313,16 @@ NetViewer::loadNetworkStatus()
+ {
+   NetworkStatus networkStatus = _torControl->getNetworkStatus();
+ 
++  bool usingMicrodescriptors = _torControl->useMicrodescriptors();
++
+   foreach(RouterStatus rs, networkStatus) {
+     if (!rs.isRunning())
+       continue;
+ 
+     RouterDescriptor rd = _torControl->getRouterDescriptor(rs.id());
++    if(usingMicrodescriptors) {
++      rd.appendRouterStatusInfo(rs);
++    }
+     if (!rd.isEmpty())
+       addRouter(rd);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a608de8..9d09ce1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 debians-tor-binary-path.patch
 use-control-socket.patch
+Append-router-status-information-if-Tor-is-using-mic.patch

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