nmathewson Merge branch 'maint-0.4.3'