Merge remote-tracking branch 'origin/master'

diff --combined youtube_dl/YoutubeDL.py
index 3c47eb9dc49d81f3409e93c44d7d6bb160e46ec1,0a4dbbbd940227621b4e31a1bdc6a3508dc2b9cb..08037deda48c05c74e40e989fee4af34887ae6fa
--- 1/youtube_dl/YoutubeDL.py
--- 2/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@@ -148,7 -148,6 +148,7 @@@ class YoutubeDL(object)
      socket_timeout:    Time to wait for unresponsive hosts, in seconds
      bidi_workaround:   Work around buggy terminals without bidirectional text
                         support, using fridibi
 +    debug_printtraffic:Print out sent and received HTTP traffic
  
      The following parameters are not used by YoutubeDL itself, they are used by
      the FileDownloader:
@@@ -1017,7 -1016,7 +1017,7 @@@
      def list_formats(self, info_dict):
          def format_note(fdict):
              res = u''
-             if f.get('ext') in ['f4f', 'f4m']:
+             if fdict.get('ext') in ['f4f', 'f4m']:
                  res += u'(unsupported) '
              if fdict.get('format_note') is not None:
                  res += fdict['format_note'] + u' '
@@@ -1127,13 -1126,10 +1127,13 @@@
              if 'http' in proxies and 'https' not in proxies:
                  proxies['https'] = proxies['http']
          proxy_handler = compat_urllib_request.ProxyHandler(proxies)
 +
 +        debuglevel = 1 if self.params.get('debug_printtraffic') else 0
          https_handler = make_HTTPS_handler(
 -            self.params.get('nocheckcertificate', False))
 +            self.params.get('nocheckcertificate', False), debuglevel=debuglevel)
 +        ydlh = YoutubeDLHandler(debuglevel=debuglevel)
          opener = compat_urllib_request.build_opener(
 -            https_handler, proxy_handler, cookie_processor, YoutubeDLHandler())
 +            https_handler, proxy_handler, cookie_processor, ydlh)
          # Delete the default user-agent header, which would otherwise apply in
          # cases where our custom HTTP handler doesn't come into play
          # (See https://github.com/rg3/youtube-dl/issues/1309 for details)