nmathewson Merge remote-tracking branch 'origin/maint-0.2.4'