Recent commits to tor-webwml.git (7c149297d6089320b0bace18cf65ecaf81720e02) https://git.schokokeks.org/tor-webwml.git/tree/7c149297d6089320b0bace18cf65ecaf81720e02 Recent commits feed provided by GitList. Merge branch 'projects-toricon' https://git.schokokeks.org/tor-webwml.git/commit/7c149297d6089320b0bace18cf65ecaf81720e02 hiro@torproject.org (hiro) Mon, 27 Aug 2018 12:44:36 +0200 7c149297d6089320b0bace18cf65ecaf81720e02 0.3.4.7-rc is now tagged. https://git.schokokeks.org/tor-webwml.git/commit/cc2b06bf8f1632de0f4a4d045177cc8f33887728 nickm@torproject.org (Nick Mathewson) Fri, 24 Aug 2018 22:33:20 +0200 cc2b06bf8f1632de0f4a4d045177cc8f33887728 Fix merging conflicts https://git.schokokeks.org/tor-webwml.git/commit/2b193d6eaa11815906c3c71ba9d47e089af87063 hiro@torproject.org (hiro) Thu, 23 Aug 2018 16:47:20 +0200 2b193d6eaa11815906c3c71ba9d47e089af87063 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 merge upstream/master https://git.schokokeks.org/tor-webwml.git/commit/f8e4e38dac98c1b0e42f76040fc6e7ac47b24713 traumschuleriebau@riseup.net (traumschule) Wed, 22 Aug 2018 21:11:06 +0200 f8e4e38dac98c1b0e42f76040fc6e7ac47b24713