[tor-commits] [vidalia/master] Fold in changes for 0.2.16