[tor-commits] [vidalia/alpha] Merge branch 'master' into alpha

[chiiph at torproject.org]

commit f9d789ef4c8ce6e9006255a7f79517bcf5c15534
Merge: ff19c25 1334480
Author: Tomas Touceda <chiiph at gentoo.org>
Date:   Thu May 5 15:58:30 2011 -0300

    Merge branch 'master' into alpha

 src/vidalia/network/RouterDescriptorView.cpp |    5 ++++-
 src/vidalia/network/RouterListItem.cpp       |    4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)