diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-19 14:29:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-19 14:29:01 -0400 |
| commit | 275e831ceac6382aafb1186976a3edfadcd0c87e (patch) | |
| tree | 38730c9aa57fda86802017a50c94483dab306c66 | |
| parent | 95c3cc2b904f6bf7e5d381193b9e59ec32a2713c (diff) | |
| parent | b0c41e3ec2bca832466ea7709827518159af0c08 (diff) | |
| download | tor-275e831ceac6382aafb1186976a3edfadcd0c87e.tar.gz tor-275e831ceac6382aafb1186976a3edfadcd0c87e.zip | |
Merge remote-tracking branch 'tor-github/pr/396'
| -rw-r--r-- | src/config/mmdb-convert.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/config/mmdb-convert.py b/src/config/mmdb-convert.py index 3a454a3fc1..706a8b03cc 100644 --- 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): |