Changes for WOT

 It seems like you didn't really cherry-pick the FreenetURI changes of the last pull request even though you said so?