Convicted rapist charged with Beacon Hill rape