{"action":"created","issue":{"url":"https://api.github.com/repos/freedomofpress/securedrop/issues/1075","labels_url":"https://api.github.com/repos/freedomofpress/securedrop/issues/1075/labels{/name}","comments_url":"https://api.github.com/repos/freedomofpress/securedrop/issues/1075/comments","events_url":"https://api.github.com/repos/freedomofpress/securedrop/issues/1075/events","html_url":"https://github.com/freedomofpress/securedrop/pull/1075","id":96153685,"number":1075,"title":"Merge fixes from 0.3.4 release into development branch","user":{"login":"garrettr","id":407302,"avatar_url":"https://avatars.githubusercontent.com/u/407302?v=3","gravatar_id":"","url":"https://api.github.com/users/garrettr","html_url":"https://github.com/garrettr","followers_url":"https://api.github.com/users/garrettr/followers","following_url":"https://api.github.com/users/garrettr/following{/other_user}","gists_url":"https://api.github.com/users/garrettr/gists{/gist_id}","starred_url":"https://api.github.com/users/garrettr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/garrettr/subscriptions","organizations_url":"https://api.github.com/users/garrettr/orgs","repos_url":"https://api.github.com/users/garrettr/repos","events_url":"https://api.github.com/users/garrettr/events{/privacy}","received_events_url":"https://api.github.com/users/garrettr/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-07-20T20:34:08Z","updated_at":"2015-07-20T22:37:42Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/freedomofpress/securedrop/pulls/1075","html_url":"https://github.com/freedomofpress/securedrop/pull/1075","diff_url":"https://github.com/freedomofpress/securedrop/pull/1075.diff","patch_url":"https://github.com/freedomofpress/securedrop/pull/1075.patch"},"body":"This was a simple `git merge 0.3.4` into develop, with some merge conflicts manually resolved. @conorsch and I went through these together and I am confident in the outcome of each of the merges.\r\n\r\nThe commits that Git chose to use in the merge are not exactly what was expected - as can be seen from the diff, it appears that in some places (e.g. `changelog.md` and some of the Debian release files) the diff jumps from 0.3.2 to 0.3.4, which would suggest that 0.3.3 was never merged back into develop from the `release/0.3.3` branch. However, this _did_ happen in 4bce6efd58e302c1e9e44f4997967c4812522565.\r\n\r\nI am not sure what caused this unexpected behavior, but my guess is the tricky merge for 0.3.3 (remember, there were an enormous number of changes to the Ansible playbooks), which I think I actually ended up doing via rebase. This would've messed with Git's history and subsequent decision-making about the parent commits to use in the merge.\r\n\r\nOn the other hand, I have carefully reviewed the full diff (\"Files changed\") of this PR and it looks good to me. I have verified that it includes _all_ of the iSec fixes, the Tor directory permissions fix, and the documentation fixes from 0.3.4."},"comment":{"url":"https://api.github.com/repos/freedomofpress/securedrop/issues/comments/123075350","html_url":"https://github.com/freedomofpress/securedrop/pull/1075#issuecomment-123075350","issue_url":"https://api.github.com/repos/freedomofpress/securedrop/issues/1075","id":123075350,"user":{"login":"garrettr","id":407302,"avatar_url":"https://avatars.githubusercontent.com/u/407302?v=3","gravatar_id":"","url":"https://api.github.com/users/garrettr","html_url":"https://github.com/garrettr","followers_url":"https://api.github.com/users/garrettr/followers","following_url":"https://api.github.com/users/garrettr/following{/other_user}","gists_url":"https://api.github.com/users/garrettr/gists{/gist_id}","starred_url":"https://api.github.com/users/garrettr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/garrettr/subscriptions","organizations_url":"https://api.github.com/users/garrettr/orgs","repos_url":"https://api.github.com/users/garrettr/repos","events_url":"https://api.github.com/users/garrettr/events{/privacy}","received_events_url":"https://api.github.com/users/garrettr/received_events","type":"User","site_admin":false},"created_at":"2015-07-20T22:37:42Z","updated_at":"2015-07-20T22:37:42Z","body":"@conorsch @dolanjs Review please"}}