{"action":"opened","number":1823,"pull_request":{"url":"https://api.github.com/repos/mitmproxy/mitmproxy/pulls/1823","id":97051950,"html_url":"https://github.com/mitmproxy/mitmproxy/pull/1823","diff_url":"https://github.com/mitmproxy/mitmproxy/pull/1823.diff","patch_url":"https://github.com/mitmproxy/mitmproxy/pull/1823.patch","issue_url":"https://api.github.com/repos/mitmproxy/mitmproxy/issues/1823","number":1823,"state":"open","locked":false,"title":"options: add a merge method to assimilate options","user":{"login":"cortesi","id":22544,"avatar_url":"https://avatars.githubusercontent.com/u/22544?v=3","gravatar_id":"","url":"https://api.github.com/users/cortesi","html_url":"https://github.com/cortesi","followers_url":"https://api.github.com/users/cortesi/followers","following_url":"https://api.github.com/users/cortesi/following{/other_user}","gists_url":"https://api.github.com/users/cortesi/gists{/gist_id}","starred_url":"https://api.github.com/users/cortesi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cortesi/subscriptions","organizations_url":"https://api.github.com/users/cortesi/orgs","repos_url":"https://api.github.com/users/cortesi/repos","events_url":"https://api.github.com/users/cortesi/events{/privacy}","received_events_url":"https://api.github.com/users/cortesi/received_events","type":"User","site_admin":false},"body":"Fixes #953","created_at":"2016-12-08T03:15:07Z","updated_at":"2016-12-08T03:15:07Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/mitmproxy/mitmproxy/pulls/1823/commits","review_comments_url":"https://api.github.com/repos/mitmproxy/mitmproxy/pulls/1823/comments","review_comment_url":"https://api.github.com/repos/mitmproxy/mitmproxy/pulls/comments{/number}","comments_url":"https://api.github.com/repos/mitmproxy/mitmproxy/issues/1823/comments","statuses_url":"https://api.github.com/repos/mitmproxy/mitmproxy/statuses/e943147fc392383ada7607124e84b1a7db4d4b28","head":{"label":"cortesi:options2","ref":"options2","sha":"e943147fc392383ada7607124e84b1a7db4d4b28","user":{"login":"cortesi","id":22544,"avatar_url":"https://avatars.githubusercontent.com/u/22544?v=3","gravatar_id":"","url":"https://api.github.com/users/cortesi","html_url":"https://github.com/cortesi","followers_url":"https://api.github.com/users/cortesi/followers","following_url":"https://api.github.com/users/cortesi/following{/other_user}","gists_url":"https://api.github.com/users/cortesi/gists{/gist_id}","starred_url":"https://api.github.com/users/cortesi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cortesi/subscriptions","organizations_url":"https://api.github.com/users/cortesi/orgs","repos_url":"https://api.github.com/users/cortesi/repos","events_url":"https://api.github.com/users/cortesi/events{/privacy}","received_events_url":"https://api.github.com/users/cortesi/received_events","type":"User","site_admin":false},"repo":{"id":52783278,"name":"mitmproxy","full_name":"cortesi/mitmproxy","owner":{"login":"cortesi","id":22544,"avatar_url":"https://avatars.githubusercontent.com/u/22544?v=3","gravatar_id":"","url":"https://api.github.com/users/cortesi","html_url":"https://github.com/cortesi","followers_url":"https://api.github.com/users/cortesi/followers","following_url":"https://api.github.com/users/cortesi/following{/other_user}","gists_url":"https://api.github.com/users/cortesi/gists{/gist_id}","starred_url":"https://api.github.com/users/cortesi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cortesi/subscriptions","organizations_url":"https://api.github.com/users/cortesi/orgs","repos_url":"https://api.github.com/users/cortesi/repos","events_url":"https://api.github.com/users/cortesi/events{/privacy}","received_events_url":"https://api.github.com/users/cortesi/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/cortesi/mitmproxy","description":"An interactive SSL-capable intercepting HTTP proxy for penetration testers and software developers","fork":true,"url":"https://api.github.com/repos/cortesi/mitmproxy","forks_url":"https://api.github.com/repos/cortesi/mitmproxy/forks","keys_url":"https://api.github.com/repos/cortesi/mitmproxy/keys{/key_id}","collaborators_url":"https://api.github.com/repos/cortesi/mitmproxy/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/cortesi/mitmproxy/teams","hooks_url":"https://api.github.com/repos/cortesi/mitmproxy/hooks","issue_events_url":"https://api.github.com/repos/cortesi/mitmproxy/issues/events{/number}","events_url":"https://api.github.com/repos/cortesi/mitmproxy/events","assignees_url":"https://api.github.com/repos/cortesi/mitmproxy/assignees{/user}","branches_url":"https://api.github.com/repos/cortesi/mitmproxy/branches{/branch}","tags_url":"https://api.github.com/repos/cortesi/mitmproxy/tags","blobs_url":"https://api.github.com/repos/cortesi/mitmproxy/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/cortesi/mitmproxy/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/cortesi/mitmproxy/git/refs{/sha}","trees_url":"https://api.github.com/repos/cortesi/mitmproxy/git/trees{/sha}","statuses_url":"https://api.github.com/repos/cortesi/mitmproxy/statuses/{sha}","languages_url":"https://api.github.com/repos/cortesi/mitmproxy/languages","stargazers_url":"https://api.github.com/repos/cortesi/mitmproxy/stargazers","contributors_url":"https://api.github.com/repos/cortesi/mitmproxy/contributors","subscribers_url":"https://api.github.com/repos/cortesi/mitmproxy/subscribers","subscription_url":"https://api.github.com/repos/cortesi/mitmproxy/subscription","commits_url":"https://api.github.com/repos/cortesi/mitmproxy/commits{/sha}","git_commits_url":"https://api.github.com/repos/cortesi/mitmproxy/git/commits{/sha}","comments_url":"https://api.github.com/repos/cortesi/mitmproxy/comments{/number}","issue_comment_url":"https://api.github.com/repos/cortesi/mitmproxy/issues/comments{/number}","contents_url":"https://api.github.com/repos/cortesi/mitmproxy/contents/{+path}","compare_url":"https://api.github.com/repos/cortesi/mitmproxy/compare/{base}...{head}","merges_url":"https://api.github.com/repos/cortesi/mitmproxy/merges","archive_url":"https://api.github.com/repos/cortesi/mitmproxy/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/cortesi/mitmproxy/downloads","issues_url":"https://api.github.com/repos/cortesi/mitmproxy/issues{/number}","pulls_url":"https://api.github.com/repos/cortesi/mitmproxy/pulls{/number}","milestones_url":"https://api.github.com/repos/cortesi/mitmproxy/milestones{/number}","notifications_url":"https://api.github.com/repos/cortesi/mitmproxy/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/cortesi/mitmproxy/labels{/name}","releases_url":"https://api.github.com/repos/cortesi/mitmproxy/releases{/id}","deployments_url":"https://api.github.com/repos/cortesi/mitmproxy/deployments","created_at":"2016-02-29T10:30:53Z","updated_at":"2016-11-22T16:03:51Z","pushed_at":"2016-12-08T03:13:29Z","git_url":"git://github.com/cortesi/mitmproxy.git","ssh_url":"git@github.com:cortesi/mitmproxy.git","clone_url":"https://github.com/cortesi/mitmproxy.git","svn_url":"https://github.com/cortesi/mitmproxy","homepage":"http://mitmproxy.org","size":33169,"stargazers_count":9,"watchers_count":9,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":9,"default_branch":"master"}},"base":{"label":"mitmproxy:master","ref":"master","sha":"fdd1e23875f2d56a1461444f0d77ffdd23b9256a","user":{"login":"mitmproxy","id":4652787,"avatar_url":"https://avatars.githubusercontent.com/u/4652787?v=3","gravatar_id":"","url":"https://api.github.com/users/mitmproxy","html_url":"https://github.com/mitmproxy","followers_url":"https://api.github.com/users/mitmproxy/followers","following_url":"https://api.github.com/users/mitmproxy/following{/other_user}","gists_url":"https://api.github.com/users/mitmproxy/gists{/gist_id}","starred_url":"https://api.github.com/users/mitmproxy/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mitmproxy/subscriptions","organizations_url":"https://api.github.com/users/mitmproxy/orgs","repos_url":"https://api.github.com/users/mitmproxy/repos","events_url":"https://api.github.com/users/mitmproxy/events{/privacy}","received_events_url":"https://api.github.com/users/mitmproxy/received_events","type":"Organization","site_admin":false},"repo":{"id":519832,"name":"mitmproxy","full_name":"mitmproxy/mitmproxy","owner":{"login":"mitmproxy","id":4652787,"avatar_url":"https://avatars.githubusercontent.com/u/4652787?v=3","gravatar_id":"","url":"https://api.github.com/users/mitmproxy","html_url":"https://github.com/mitmproxy","followers_url":"https://api.github.com/users/mitmproxy/followers","following_url":"https://api.github.com/users/mitmproxy/following{/other_user}","gists_url":"https://api.github.com/users/mitmproxy/gists{/gist_id}","starred_url":"https://api.github.com/users/mitmproxy/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mitmproxy/subscriptions","organizations_url":"https://api.github.com/users/mitmproxy/orgs","repos_url":"https://api.github.com/users/mitmproxy/repos","events_url":"https://api.github.com/users/mitmproxy/events{/privacy}","received_events_url":"https://api.github.com/users/mitmproxy/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/mitmproxy/mitmproxy","description":"An interactive TLS-capable intercepting HTTP proxy for penetration testers and software developers","fork":false,"url":"https://api.github.com/repos/mitmproxy/mitmproxy","forks_url":"https://api.github.com/repos/mitmproxy/mitmproxy/forks","keys_url":"https://api.github.com/repos/mitmproxy/mitmproxy/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mitmproxy/mitmproxy/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mitmproxy/mitmproxy/teams","hooks_url":"https://api.github.com/repos/mitmproxy/mitmproxy/hooks","issue_events_url":"https://api.github.com/repos/mitmproxy/mitmproxy/issues/events{/number}","events_url":"https://api.github.com/repos/mitmproxy/mitmproxy/events","assignees_url":"https://api.github.com/repos/mitmproxy/mitmproxy/assignees{/user}","branches_url":"https://api.github.com/repos/mitmproxy/mitmproxy/branches{/branch}","tags_url":"https://api.github.com/repos/mitmproxy/mitmproxy/tags","blobs_url":"https://api.github.com/repos/mitmproxy/mitmproxy/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mitmproxy/mitmproxy/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mitmproxy/mitmproxy/git/refs{/sha}","trees_url":"https://api.github.com/repos/mitmproxy/mitmproxy/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mitmproxy/mitmproxy/statuses/{sha}","languages_url":"https://api.github.com/repos/mitmproxy/mitmproxy/languages","stargazers_url":"https://api.github.com/repos/mitmproxy/mitmproxy/stargazers","contributors_url":"https://api.github.com/repos/mitmproxy/mitmproxy/contributors","subscribers_url":"https://api.github.com/repos/mitmproxy/mitmproxy/subscribers","subscription_url":"https://api.github.com/repos/mitmproxy/mitmproxy/subscription","commits_url":"https://api.github.com/repos/mitmproxy/mitmproxy/commits{/sha}","git_commits_url":"https://api.github.com/repos/mitmproxy/mitmproxy/git/commits{/sha}","comments_url":"https://api.github.com/repos/mitmproxy/mitmproxy/comments{/number}","issue_comment_url":"https://api.github.com/repos/mitmproxy/mitmproxy/issues/comments{/number}","contents_url":"https://api.github.com/repos/mitmproxy/mitmproxy/contents/{+path}","compare_url":"https://api.github.com/repos/mitmproxy/mitmproxy/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mitmproxy/mitmproxy/merges","archive_url":"https://api.github.com/repos/mitmproxy/mitmproxy/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mitmproxy/mitmproxy/downloads","issues_url":"https://api.github.com/repos/mitmproxy/mitmproxy/issues{/number}","pulls_url":"https://api.github.com/repos/mitmproxy/mitmproxy/pulls{/number}","milestones_url":"https://api.github.com/repos/mitmproxy/mitmproxy/milestones{/number}","notifications_url":"https://api.github.com/repos/mitmproxy/mitmproxy/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mitmproxy/mitmproxy/labels{/name}","releases_url":"https://api.github.com/repos/mitmproxy/mitmproxy/releases{/id}","deployments_url":"https://api.github.com/repos/mitmproxy/mitmproxy/deployments","created_at":"2010-02-16T04:10:13Z","updated_at":"2016-12-07T21:56:45Z","pushed_at":"2016-12-08T00:42:14Z","git_url":"git://github.com/mitmproxy/mitmproxy.git","ssh_url":"git@github.com:mitmproxy/mitmproxy.git","clone_url":"https://github.com/mitmproxy/mitmproxy.git","svn_url":"https://github.com/mitmproxy/mitmproxy","homepage":"http://mitmproxy.org","size":41041,"stargazers_count":6174,"watchers_count":6174,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":877,"mirror_url":null,"open_issues_count":77,"forks":877,"open_issues":77,"watchers":6174,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/mitmproxy/mitmproxy/pulls/1823"},"html":{"href":"https://github.com/mitmproxy/mitmproxy/pull/1823"},"issue":{"href":"https://api.github.com/repos/mitmproxy/mitmproxy/issues/1823"},"comments":{"href":"https://api.github.com/repos/mitmproxy/mitmproxy/issues/1823/comments"},"review_comments":{"href":"https://api.github.com/repos/mitmproxy/mitmproxy/pulls/1823/comments"},"review_comment":{"href":"https://api.github.com/repos/mitmproxy/mitmproxy/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/mitmproxy/mitmproxy/pulls/1823/commits"},"statuses":{"href":"https://api.github.com/repos/mitmproxy/mitmproxy/statuses/e943147fc392383ada7607124e84b1a7db4d4b28"}},"merged":false,"mergeable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"commits":1,"additions":54,"deletions":29,"changed_files":7}}
{"actor":{"display_login":"cortesi"}}