Etymonline suggests it might be a combination of both definitions: https://www.etymonline.com/word/troll