[tor-commits] [tor/maint-0.2.2] Fix two potential bugs in the bug1863 code.