The verses by Martí, the new words by Diaz, and the Celia Cruz versions are all given in thread 16967, along with some of the history of the song:
Lyr. Add: Guantanamera

This and other threads bearing on the song are linked at the top of the page. The link I give here is the most informative of the lot.
Note- The verses by Martí did not mention the Guantanamo area.