[tor-commits] [vidalia-plugins/master] Merge remote-tracking branch 'feroze/hiddenservice'