A country in the Central Asia has issued a law enforcing all the ISPs to decrypt the transit HTTPS traffic and encrypt it with a special certificate issued by the government. Every client is to install the certificate to be able to access HTTPS resources (they just won't work without this). At least some other countries can be expected to follow. Needless to say this means HTTPS is not a sufficient solution to guarantee privacy of the data transmitted between the clients and the servers any more. What are some reasonable/interesting ideas of ways to address this issue practically?
I know about VPN and SSH but this seems a fairly clumsy solution - governments blocking HTTPS will probably block all the easily recognizable top-layer encryption solutions like SSH and VPN too. So, what I am generally interested in is implementing a second layer of end-to-end encryption on the application level.
I am working on an idea of a personal information organizer sort of a web app to store my personal data (including, among other data, passwords, intimate pictures and data like this) on my personal server and access it wherever I go. Needless to say I don't want anybody to be able to intercept the data when I happen to travel to a country where such an anti-ptivacy policy has been implemented.