I'm assuming I can set something up through my dd-wrt router at home. Off to read the docs...
This is much easier than trying to find VPN service that isn't blocked.
autossh -M 25841 -ND 127.0.0.1:8088 -i /home/.ssh/id_rsa user@host.com
and then tell your browser (or foxyproxy) to use it. one-line vpn that probably won't get blocked by china, ever.
After my last trip, though, I got tired of the speed over an ssh based proxy and installed open vpn on my server and just used a tunnel. Wayyy faster. It's fast enough to watch Hulu and Netflix if your hotel has enough bandwidth.
The other option is to just purchase an openvpn based proxy subscription for a month and use that. Same thing and less fuss. I think running it myself is less likely to result in a blocked IP address since I won't garner as much attention but who knows how much they actually watch and actively block IPs for those services.