[tor-commits] [flashproxy/master] update ChangeLog for recent merges and commits