[tor-commits] [chutney/master] Merge remote-tracking branch 'nickm/misc_bugs'