Merge branch 'master' into tcp_proxy

libmproxy/dump.py

@@ -223,8 +223,7 @@ class DumpMaster(flow.FlowMaster):
 
     def run(self):  # pragma: no cover
         if self.o.rfile and not self.o.keepserving:
-            for script in self.scripts:
-                self.unload_script(script)
+            self.shutdown()
             return
         try:
             return flow.FlowMaster.run(self)