Bug 969689: Update hgtool from upstream. r=me