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