[tor-commits] [vidalia/master] Merge branch 'bug3109_torrc'