From 75eef9ef2f82deb1272a8dbc2a261e0ea088d0de Mon Sep 17 00:00:00 2001
From: Peter Surda <surda@economicsofbitcoin.com>
Date: Mon, 2 May 2016 17:33:18 +0200
Subject: [PATCH] Fix merge conflicts

Missed this difference in the last commit
---
 src/upnp.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/upnp.py b/src/upnp.py
index e6b689fc..8e5fbee0 100644
--- a/src/upnp.py
+++ b/src/upnp.py
@@ -1,5 +1,7 @@
 # A simple upnp module to forward port for BitMessage
 # Reference: http://mattscodecave.com/posts/using-python-and-upnp-to-forward-a-port
+import httplib
+from random import randint
 import socket
 from struct import unpack, pack
 import threading