[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05' into maint-0.2.9

commit cb92d47deca15c44dd52cad6fc326520648c632e Merge: 2b99350ca e7f631478 Author: Nick Mathewson Date: Fri Feb 16 09:41:06 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24902_029_05' into maint-0.2.9 changes/bug24952| 5 + changes/bug25223| 4 + chang

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

commit 86f461e362480bb5bdbeec983df55044d0837cd8 Merge: 412a8256a e7f631478 Author: Nick Mathewson Date: Tue Feb 13 15:00:43 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24902_029_05' changes/bug25223| 4 changes/ticket25202 | 4 doc/tor.1.txt | 35 +

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

commit ef164346d4c6ee1b315e73917f3ec007b714a355 Merge: 4f98ec9fd 1555946e2 Author: Nick Mathewson Date: Tue Feb 13 08:47:06 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24902_029_05' src/common/address.c | 7 +-- src/common/address_set.c | 2 +- 2 files changed, 6 insert

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

commit abdf2a6f7f400bf7769b701c79b51e51f1cc9e55 Merge: d9826b0a3 1a4fc9cdd Author: Nick Mathewson Date: Fri Feb 9 12:08:12 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24902_029_05' src/common/address.c| 22 ++ src/common/address.h| 2 + src/common/address

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

commit b5a8fd1566e137f27c49d132755d2ad9e5c74f4e Merge: f0d7905bc f08fa9746 Author: Nick Mathewson Date: Mon Feb 5 14:00:50 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24902_029_05' src/or/geoip.c | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-)

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

commit f0d7905bc9f20ecee43da3db369073ffb73b4997 Merge: 953c769a8 78d6cb587 Author: Nick Mathewson Date: Mon Feb 5 11:38:58 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24902_029_05' src/or/dos.c| 2 -- src/test/test_dos.c | 4 ++-- 2 files changed, 2 insertions(+), 4 del

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

commit eafa252b26ecf83a8a48e7e19a3315e1d2983186 Merge: 9e48338a1 475218c10 Author: Nick Mathewson Date: Fri Feb 2 15:00:35 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24902_029_05' changes/ticket25122 | 4 ++ src/or/geoip.c | 148 +

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

commit d1c2597096cac27eb9ee842f52384ca4cb28a195 Merge: 8b0b850ef 33d9889a2 Author: Nick Mathewson Date: Wed Jan 31 16:17:04 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24902_029_05' changes/bug24952| 5 + src/or/channeltls.c | 2 +- 2 files changed, 6 insertions(+), 1 d

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

commit 94878cf1eaa59f4aae6bc88c93d55c4ecba1e0d9 Merge: c0447033f 1f4a73133 Author: Nick Mathewson Date: Wed Jan 31 09:35:07 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24902_029_05' src/or/dos.c| 82 - src/or/dos.h| 2 +- src/test/