[tor-commits] [tor/release-0.2.2] Merge commit 'a5704b1c624c9a808f52f3a125339f00e2b9a378' into maint-0.2.2