Commit b3d68896 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'tor-github/pr/71'

parents 76ba7f88 9c325ceb

lib/chutney/TorNet.py

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ import os 
import platform

import re

import signal

import shutil

import subprocess

import sys

import time

lib/chutney/Traffic.py

+0 −2
Original line number Diff line number Diff line
@@ -28,9 +28,7 @@ from __future__ import unicode_literals 
import sys

import socket

import struct

import errno

import time

import os



import asyncore

import asynchat