This merge is here to take a commit (feature 3951) that we already have in master, so use "merge -s ours"
Nick Mathewson