commit 275e831ceac6382aafb1186976a3edfadcd0c87e
parent 95c3cc2b904f6bf7e5d381193b9e59ec32a2713c
Author: Nick Mathewson <nickm@torproject.org>
Date: Fri, 19 Oct 2018 14:29:01 -0400
Merge remote-tracking branch 'tor-github/pr/396'
Diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/config/mmdb-convert.py b/src/config/mmdb-convert.py
@@ -77,7 +77,7 @@ def to_int32(s):
def to_int28(s):
"Parse a pair of big-endian 28-bit integers from bytestring s."
- a, b = unpack("!LL", s + b'\x00')
+ a, b = struct.unpack("!LL", s + b'\x00')
return (((a & 0xf0) << 20) + (a >> 8)), ((a & 0x0f) << 24) + (b >> 8)
class Tree(object):