[tor-commits] [gettor/master] Merge branch 'bug4163'