(this is an "ours" merge, to avoid taking 6a4f5d9b4d into 0.2.5: that commit downgrades the bug 7164 warning in versions <= 0.2.4 because it isn't as useful as the one 0.2.5 has)
Nick Mathewson