[tor-commits] [vidalia/master] Merge branch '5766_clicklabel'