[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

2021-05-17 Thread nickm
commit e247aab4eceeb3920f1667bf5a11d5bc83b950cc Merge: 11ac256a44 debede5e50 Author: Nick Mathewson Date: Mon May 17 09:09:49 2021 -0400 Merge branch 'maint-0.4.6' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torpro

[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

2021-05-17 Thread nickm
commit af560f21ece5a7b077bf289d07f9a41163d915c4 Merge: d4718e4db9 fbd47a5078 Author: Nick Mathewson Date: Mon May 17 09:04:22 2021 -0400 Merge branch 'maint-0.4.6' changes/ticket40370| 4 src/core/mainloop/connection.c | 1 + 2 files changed, 5 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

2021-05-10 Thread nickm
commit d82970c8c316e70abf49b2e37f6e7ba3db32585b Merge: 6cc87bc269 8851861ff0 Author: Nick Mathewson Date: Mon May 10 14:30:09 2021 -0400 Merge branch 'maint-0.4.6' changes/ticket40374| 4 src/feature/dirparse/parsecommon.c | 27 +-- src/featur

[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

2021-05-10 Thread nickm
commit 6cc87bc269b0e2ebeb9e4ea1dd5c9df45bf53c4d Merge: 9c8f7710e6 af6da4a36b Author: Nick Mathewson Date: Mon May 10 10:55:00 2021 -0400 Merge branch 'maint-0.4.6' "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@li

[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

2021-05-07 Thread nickm
commit 4e62c171144c1b4a1cb1447d86a177655f90c0b6 Merge: a4c8591c35 e4f2b52deb Author: Nick Mathewson Date: Fri May 7 13:08:25 2021 -0400 Merge branch 'maint-0.4.6' changes/ticket40382 | 6 ++ src/lib/sandbox/sandbox.c | 22 ++ 2 files changed, 28 insertions(+

[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

2021-05-07 Thread nickm
commit a4c8591c351358e18897f038efbea27cfd295ce6 Merge: 1c9890bd31 5acf18bfaa Author: Nick Mathewson Date: Fri May 7 10:41:34 2021 -0400 Merge branch 'maint-0.4.6' changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4 deletions(-) ___

[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

2021-05-07 Thread nickm
commit 1c9890bd3100730b0af1650b90c6a35d8e9e0997 Merge: 89e3028590 0397a9cb49 Author: Nick Mathewson Date: Fri May 7 09:53:58 2021 -0400 Merge branch 'maint-0.4.6' changes/geoip-2021-05-07 |3 + src/config/geoip | 3227 -- src/config/

[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

2021-05-07 Thread nickm
commit 89e3028590e4fbe7cbe0948e1533bcb3c1183d6a Merge: 93af8b1ad8 8142b368e7 Author: Nick Mathewson Date: Fri May 7 09:42:39 2021 -0400 Merge branch 'maint-0.4.6' "ours" merge to avoid version bump. ___ tor-commits mailing list tor-commi

[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

2021-05-07 Thread dgoulet
commit 93af8b1ad859a7dc4195d4a049e35bd3e197cffe Merge: 9334e7c775 a42e58a284 Author: David Goulet Date: Fri May 7 09:05:21 2021 -0400 Merge branch 'maint-0.4.6' changes/ticket40373 | 3 +++ src/core/or/connection_edge.c | 43 +-- src/core

[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

2021-05-07 Thread dgoulet
commit 9334e7c775efce6444a18fec2afa7962544925f7 Merge: d6e7fc00f3 b1b4c05fb3 Author: David Goulet Date: Fri May 7 09:04:45 2021 -0400 Merge branch 'maint-0.4.6' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torpro

[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

2021-05-05 Thread asn
commit d6e7fc00f3c3f3d77b0f3257e7bb0d83e35b3e2a Merge: 1d18ecbc5f cf6e72b702 Author: George Kadianakis Date: Wed May 5 10:21:48 2021 +0300 Merge branch 'maint-0.4.6' changes/ticket40378 | 4 src/feature/hs/hs_service.c | 18 +++--- src/feature/hs/hs_service.h |

[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

2021-04-23 Thread asn
commit 973fcf056a21087157e2f07ac94899521b50e1d4 Merge: fe9bd6bd96 f0260c4cea Author: George Kadianakis Date: Fri Apr 23 13:00:24 2021 +0300 Merge branch 'maint-0.4.6' changes/ticket40356 | 3 +++ src/feature/hs/hs_cache.c | 61 --- 2 file

[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

2021-04-21 Thread nickm
commit fe9bd6bd9675262bdd8fa4efb73818ae98545b89 Merge: cbf71c4fa7 38bfb3cdfe Author: Nick Mathewson Date: Wed Apr 21 10:34:28 2021 -0400 Merge branch 'maint-0.4.6' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torpro

[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

2021-04-19 Thread nickm
commit cbf71c4fa7a05033c068844ce9f214eeff5bb939 Merge: 07237b484e 0ceacb5482 Author: Nick Mathewson Date: Mon Apr 19 11:43:39 2021 -0400 Merge branch 'maint-0.4.6' changes/ticket40290 | 3 +++ src/app/config/resolve_addr.c | 12 2 files changed, 15 insertions(+) _

[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

2021-04-19 Thread nickm
commit de33be6e32ad9d7eef40de826b8083905293fd96 Merge: 7080e748e5 d162b98548 Author: Nick Mathewson Date: Mon Apr 19 11:30:00 2021 -0400 Merge branch 'maint-0.4.6' changes/ticket40369| 4 scripts/build/combine_libs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

2021-04-19 Thread asn
commit 874d2c8601146a0982bb16a8e6307da9a874b640 Merge: e7c407d927 461a3c732b Author: George Kadianakis Date: Mon Apr 19 17:33:46 2021 +0300 Merge branch 'maint-0.4.6' changes/autoconf-2.70 | 3 +++ configure.ac | 6 +- 2 files changed, 8 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

2021-04-15 Thread nickm
commit 8f78243fc3afdc571d921a091a40e405e6b963be Merge: d6ebd8160d e6d9dd9157 Author: Nick Mathewson Date: Thu Apr 15 12:42:33 2021 -0400 Merge branch 'maint-0.4.6' "ours" to avoid version bump. ___ tor-commits mailing list tor-commits