adding __str__ to make export to har nicer
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
adding tcp and ssl setup timestamps to get better resolution on flows performance
Adds a new view for protocol buffers

The view uses protoc from the Google protocol buffer
tools. If the tool isn't installed, the view isn't
shown.

Google protobuf repo:
https://code.google.com/p/protobuf/
Correct display mode highlight keys

Add html display mode to the help documentation.
Correct html and hex display mode highlight keys (help used 'h' for hex).
Correct json display mode highlight keys.
Merge pull request #116 from afh/pull/highlight_key_help

Correct display mode highlight keys
Merge pull request #113 from mhils/redirect_example

Add redirect example
Merge pull request #112 from hamstah/protobuf-view

Adds a new view for protocol buffers
Merge pull request #107 from rouli/master

Adding remote TCP and SSL setup timestamps
Add error checking to ViewProtobuf

There are protobufs that protoc can't parse.  When protoc --decode_raw
fails, it returns nothing to stdin, and writes "Failed to parse input."
to stderr. Before this commit, if protoc --decode_raw couldn't parse
the protobuf, the blank stdout output would get returned to the view;
with this commit stderr gets caught and returned to the view.
Adapt docs for website embedding.
Minor coverage.
Merge pull request #118 from jasonanovak/protobufs

Add error checking to ViewProtobuf
Fix crash in client playback.
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
Adapt for new request_client_cert option in netlib.
Prin an error when mitmproxy runs in a non-UTF environment.
README, Linux transparent mode docs, requirements additions.
Mods to "How mitmproxy works"