Maximilian Hils
|
61afac8637
|
Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactor
Conflicts:
libmproxy/protocol2/http_proxy.py
libmproxy/protocol2/tls.py
libmproxy/proxy/connection.py
|
2015-08-16 12:47:13 +02:00 |
|
Maximilian Hils
|
4c31ffd90f
|
minor fixes
|
2015-08-16 12:43:15 +02:00 |
|
Thomas Kriechbaumer
|
1e40d34e94
|
add ALPN to proxy connections
|
2015-08-16 11:36:31 +02:00 |
|
Maximilian Hils
|
a175572447
|
Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactor
|
2015-08-15 20:22:45 +02:00 |
|
Maximilian Hils
|
2a15479cdb
|
fix bugs, make https work
|
2015-08-15 20:20:46 +02:00 |
|
Thomas Kriechbaumer
|
a9dd82c986
|
add ALPN to proxy connections
|
2015-08-15 17:49:40 +02:00 |
|
Maximilian Hils
|
808218f4bc
|
more work on http layer
|
2015-08-14 10:41:11 +02:00 |
|
Maximilian Hils
|
aef3b626a7
|
wip commit
|
2015-08-11 20:32:14 +02:00 |
|