Merge lp://qastaging/~racb/ubuntu/precise/sslsniff/merge into lp://qastaging/ubuntu/precise/sslsniff
Proposed by
Robie Basak
Status: | Merged |
---|---|
Merge reported by: | Dave Walker |
Merged at revision: | not available |
Proposed branch: | lp://qastaging/~racb/ubuntu/precise/sslsniff/merge |
Merge into: | lp://qastaging/ubuntu/precise/sslsniff |
Diff against target: |
12030 lines (+11711/-34) 18 files modified
ChangeLog (+5/-0) FingerprintManager.cpp (+2/-1) Makefile.in (+2/-1) README (+5/-9) SSLBridge.cpp (+13/-4) SSLBridge.hpp (+2/-1) certificate/AuthorityCertificateManager.cpp (+13/-3) certificate/AuthorityCertificateManager.hpp (+3/-2) certificate/CertificateManager.hpp (+2/-1) certificate/TargetedCertificateManager.cpp (+8/-4) certificate/TargetedCertificateManager.hpp (+3/-2) config.guess (+1502/-0) config.sub (+1714/-0) configure (+1/-1) configure.ac (+1/-1) debian/changelog (+19/-0) ltmain.sh (+8413/-0) sslsniff.cpp (+3/-4) |
To merge this branch: | bzr merge lp://qastaging/~racb/ubuntu/precise/sslsniff/merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dave Walker (community) | Approve | ||
Review via email: mp+79818@code.qastaging.launchpad.net |
To post a comment you must log in.
Looks great, Thanks Robie.
Uploaded.