[tor-commits] [torspec/master] Merge remote-tracking branch 'asn-gitorious/bug6059'