| commit | 42c5ff31c51d579e3f583823a131598be5a5b8f6 | |
| author | Tails developers <amnesia@boum.org> | |
| Fri, 26 Sep 2014 02:37:21 +0000 (26 04:37 +0200) | ||
| committer | Tails developers <amnesia@boum.org> | |
| Fri, 26 Sep 2014 02:37:21 +0000 (26 04:37 +0200) | ||
| tree | 05ad67d5f7c579e4efd3db19c342c2f8512ed5c2 | treesnapshot (tar.gz zip) |
| parent | aad98f70217ef39621e6f793ed82b16a69daf127 | commitdiff |
| parent | 40d53f8c598e046455b488f0906fde853cc01d99 | commitdiff |
Merge remote-tracking branch 'killyourtv/feature/7916-i2p_remove_ssl_outproxy' into devel