https://git.schokokeks.org/tor-webwml.git/tree/2b193d6eaa11815906c3c71ba9d47e089af87063 Recent commits to tor-webwml.git (2b193d6eaa11815906c3c71ba9d47e089af87063) 2018-08-23T16:47:20+02:00 tag:gitlist.org,2012:commit/2b193d6eaa11815906c3c71ba9d47e089af87063 Fix merging conflicts 2018-08-23T16:47:20+02:00 hiro hiro@torproject.org <pre>&lt;/pre&gt; tag:gitlist.org,2012:commit/f377e49a1716cd1d328f381a123673f610f003cf Resolving conflicts on commit 2018-08-23T15:15:01+02:00 hiro hiro@torproject.org <pre>&lt;/pre&gt; tag:gitlist.org,2012:commit/3aebc62231e3d10a2b3fc1d0c297496f3b98f8db Resolving conflicts on commit 2018-08-23T15:13:15+02:00 hiro hiro@torproject.org <pre>&lt;/pre&gt; tag:gitlist.org,2012:commit/7ea301bbb5be9730f3f78ed53fc0003e3cb2292b Merge commit 'ee55201' 2018-08-23T15:12:03+02:00 hiro hiro@torproject.org <pre>&lt;/pre&gt; tag:gitlist.org,2012:commit/ff629742f3baa23f748dc8bb1b83ad729a5f4aa1 Merge commit '564481f' 2018-08-23T15:11:35+02:00 hiro hiro@torproject.org <pre>&lt;/pre&gt; tag:gitlist.org,2012:commit/676da0eacc768faa2ea7a59ec0eb1e2c4fd6f054 Resolving conflicts on commit 2018-08-23T15:11:10+02:00 hiro hiro@torproject.org <pre>&lt;/pre&gt; tag:gitlist.org,2012:commit/760bf9a1b077b652562269b6876c80c5a57f9d39 onion services: few fixes (#24880) 2018-08-23T14:28:35+02:00 traumschule traumschuleriebau@riseup.net <pre>&lt;/pre&gt; tag:gitlist.org,2012:commit/e2ccb890a8f620daa28971ab41b2b7fc554bc493 Add emmapeel's pgp key 2018-08-22T19:18:06+02:00 Damian Johnson atagar@torproject.org <pre>&lt;/pre&gt; tag:gitlist.org,2012:commit/efffbdc9547dbc681927b8236d57452176a7111e Remove strange characters 2018-08-22T12:33:55+02:00 hiro hiro@torproject.org <pre>&lt;/pre&gt; tag:gitlist.org,2012:commit/ac08645cea83c2f900f81b57d70734de3ef9d099 Fix merge conflicts 2018-08-22T12:25:54+02:00 hiro hiro@torproject.org <pre>&lt;/pre&gt;