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