Commit Graph
35610 Commits
Author SHA1 Message Date
Alexander Færøy 762c8b63ce Merge branch 'maint-0.4.4' into release-0.4.4 2020-06-30 14:16:16 +00:00
Alexander Færøy bb5745d656 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-30 14:16:16 +00:00
Alexander Færøy fb46d1bb34 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-30 14:16:16 +00:00
Alexander Færøy 881f50a9a9 Merge branch 'tor-github/pr/1806' into maint-0.4.2 2020-06-30 14:15:57 +00:00
Alexander Færøy 320205ec54 Merge branch 'maint-0.4.4' into release-0.4.4 2020-06-30 14:03:04 +00:00
Alexander Færøy 572cf774b9 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-30 14:03:04 +00:00
Alexander Færøy 38f3cf4103 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-30 14:03:04 +00:00
Alexander Færøy c9c4a3d0f6 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-06-30 14:03:04 +00:00
Alexander Færøy 8444fbe904 Merge branch 'tor-github/pr/1793' into maint-0.3.5 2020-06-30 13:55:39 +00:00
Alexander Færøy 91803c3d56 Merge branch 'maint-0.4.4' into release-0.4.4 2020-06-30 13:48:49 +00:00
Alexander Færøy aced9be224 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-30 13:48:49 +00:00
Alexander Færøy 2042ebe88e Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-30 13:48:49 +00:00
Alexander Færøy 483082b57b Merge branch 'maint-0.3.5' into maint-0.4.2 2020-06-30 13:48:49 +00:00
Alexander Færøy c3ad2a1d23 Merge branch 'tor-github/pr/1785' into maint-0.3.5 2020-06-30 13:47:55 +00:00
Alexander Færøy 90f38a3c26 Merge branch 'maint-0.4.4' into release-0.4.4 2020-06-30 13:37:20 +00:00
Alexander Færøy 21cf91ee2c Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-30 13:37:20 +00:00
Alexander Færøy c57896a76e Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-30 13:37:20 +00:00
Alexander Færøy b0bfee8c78 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-06-30 13:37:20 +00:00
Alexander Færøy bebdd2888f Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5 2020-06-30 13:35:13 +00:00
Nick Mathewson 76e04a8326 Merge branch 'maint-0.4.4' into release-0.4.4 2020-06-29 13:57:50 -04:00
Nick Mathewson feddba6f8b Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 13:57:50 -04:00
Nick Mathewson eef77227ef Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-29 13:57:41 -04:00
Nick Mathewson d235e523d5 Merge branch 'ticket33290_v2_042' into maint-0.4.2 2020-06-29 13:57:13 -04:00
Nick Mathewson 1850ac4697 Merge branch 'maint-0.4.4' into release-0.4.4 2020-06-29 13:56:16 -04:00
Nick Mathewson b2ce815bd8 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 13:56:16 -04:00
Nick Mathewson d124cfc058 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-29 13:56:04 -04:00
Nick Mathewson a692b87f82 Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2 2020-06-29 13:53:27 -04:00
Nick Mathewson d5257ad069 Merge branch 'maint-0.4.4' into release-0.4.4 2020-06-29 13:48:32 -04:00
Nick Mathewson 9e85515f83 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 13:48:32 -04:00
Nick Mathewson 31bdfd4920 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-29 13:48:32 -04:00
Nick Mathewson 0575a182a6 Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2 2020-06-29 13:48:25 -04:00
Nick Mathewson d3983d3cdf Merge branch 'maint-0.4.4' into release-0.4.4 2020-06-29 12:58:50 -04:00
Nick Mathewson 6fb31bb34a Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 12:58:50 -04:00
Nick Mathewson f862971d04 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-29 12:58:50 -04:00
Nick Mathewson 216456299f Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2 2020-06-29 12:58:23 -04:00
Nick Mathewson ec91a4a662 Merge branch 'maint-0.4.4' into release-0.4.4 2020-06-29 12:56:50 -04:00
Nick Mathewson 41a4243901 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 12:56:50 -04:00
Nick Mathewson 3008255aea Merge remote-tracking branch 'tor-github/pr/1829/head' into maint-0.4.3 2020-06-29 12:56:39 -04:00
Nick Mathewson fd8ce812b0 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-06-29 12:55:35 -04:00
Nick Mathewson f46049609d Merge branch 'maint-0.4.4' into release-0.4.4 2020-06-29 12:55:35 -04:00
Nick Mathewson 2c61f22e43 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 12:55:35 -04:00
Nick Mathewson 183d0d30d6 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-29 12:55:35 -04:00
Nick Mathewson 0c0214bcc0 Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5 2020-06-29 12:55:27 -04:00
David Goulet 62b1b1bc62 Merge branch 'maint-0.4.4' into release-0.4.4 2020-06-25 07:36:56 -04:00
George Kadianakis 68d848e244 Reinstate support for GUARD NEW/UP/DOWN control port events. 2020-06-23 19:48:37 +03:00
Nick Mathewson c104a39a40 Merge branch 'maint-0.4.4' into release-0.4.4 2020-06-23 12:29:47 -04:00
Nick Mathewson 318753f502 Merge branch 'ticket34382' into maint-0.4.4 2020-06-23 12:29:39 -04:00
David Goulet 107d70360d Merge branch 'maint-0.4.4' into release-0.4.4 2020-06-23 08:52:33 -04:00
David Goulet 5232315168 Merge branch 'tor-github/pr/1937' into maint-0.4.4 2020-06-23 08:52:16 -04:00
David Goulet 961a088780 Merge branch 'maint-0.4.4' into release-0.4.4 2020-06-22 14:57:50 -04:00