Recent commits to tor-webwml.git (f377e49a1716cd1d328f381a123673f610f003cf) https://git.schokokeks.org/tor-webwml.git/tree/f377e49a1716cd1d328f381a123673f610f003cf Recent commits feed provided by GitList. Resolving conflicts on commit https://git.schokokeks.org/tor-webwml.git/commit/f377e49a1716cd1d328f381a123673f610f003cf hiro@torproject.org (hiro) Thu, 23 Aug 2018 15:15:01 +0200 f377e49a1716cd1d328f381a123673f610f003cf Resolving conflicts on commit https://git.schokokeks.org/tor-webwml.git/commit/3aebc62231e3d10a2b3fc1d0c297496f3b98f8db hiro@torproject.org (hiro) Thu, 23 Aug 2018 15:13:15 +0200 3aebc62231e3d10a2b3fc1d0c297496f3b98f8db Merge commit 'ee55201' https://git.schokokeks.org/tor-webwml.git/commit/7ea301bbb5be9730f3f78ed53fc0003e3cb2292b hiro@torproject.org (hiro) Thu, 23 Aug 2018 15:12:03 +0200 7ea301bbb5be9730f3f78ed53fc0003e3cb2292b Merge commit '564481f' https://git.schokokeks.org/tor-webwml.git/commit/ff629742f3baa23f748dc8bb1b83ad729a5f4aa1 hiro@torproject.org (hiro) Thu, 23 Aug 2018 15:11:35 +0200 ff629742f3baa23f748dc8bb1b83ad729a5f4aa1 Resolving conflicts on commit https://git.schokokeks.org/tor-webwml.git/commit/676da0eacc768faa2ea7a59ec0eb1e2c4fd6f054 hiro@torproject.org (hiro) Thu, 23 Aug 2018 15:11:10 +0200 676da0eacc768faa2ea7a59ec0eb1e2c4fd6f054 onion services: few fixes (#24880) https://git.schokokeks.org/tor-webwml.git/commit/760bf9a1b077b652562269b6876c80c5a57f9d39 traumschuleriebau@riseup.net (traumschule) Thu, 23 Aug 2018 14:28:35 +0200 760bf9a1b077b652562269b6876c80c5a57f9d39 Add emmapeel's pgp key https://git.schokokeks.org/tor-webwml.git/commit/e2ccb890a8f620daa28971ab41b2b7fc554bc493 atagar@torproject.org (Damian Johnson) Wed, 22 Aug 2018 19:18:06 +0200 e2ccb890a8f620daa28971ab41b2b7fc554bc493 Remove strange characters https://git.schokokeks.org/tor-webwml.git/commit/efffbdc9547dbc681927b8236d57452176a7111e hiro@torproject.org (hiro) Wed, 22 Aug 2018 12:33:55 +0200 efffbdc9547dbc681927b8236d57452176a7111e Fix merge conflicts https://git.schokokeks.org/tor-webwml.git/commit/ac08645cea83c2f900f81b57d70734de3ef9d099 hiro@torproject.org (hiro) Wed, 22 Aug 2018 12:25:54 +0200 ac08645cea83c2f900f81b57d70734de3ef9d099 jobs: remove both Project Manager job postings (#27227) https://git.schokokeks.org/tor-webwml.git/commit/a9e57ef33446618acb96167427586d1e74fba88e traumschuleriebau@riseup.net (traumschule) Wed, 22 Aug 2018 12:14:32 +0200 a9e57ef33446618acb96167427586d1e74fba88e