Conflicts: changes/bug5090 bug5090 was already merged and corrected in the master branch's changelog.
Nick Mathewson