So, it occurs to me that a silver lining of the near-duopoly of Android/iOS on smartphones, and device convergence, is that it is now possible to assemble a cheap travel kit of electronics circa-2006 that will cause maximum pain and friction for state border guard searches without being obvious. And the bits are cheaper than an iPhone.
E-ink reader, trad iPod clone, dumbphone, camera, writerdeck, Linux deck where you read your email in a terminal window over ssh using Mutt …
I'm very tempted.