[tor-commits] [tor/release-0.2.2] Merge branch 'cid30_changelog' into maint-0.2.2