[tor-commits] [sbws/master] Merge branch 'ticket28076_rmlink_or_header'