A 27-year-old man reported to have pushed and hit a librarian after “masturbating to pornography” on a computer at the downtown Berkeley library is now facing criminal charges and a civil restraining order.