Merge proposals dependent on lp:~psiphon-inc/psiphon/psiphon-1.6

lp:~psiphon-inc/psiphon/psiphon-1.6 has no merge proposals.