[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 0c9cd7c487ac75d9505f46e5ff42087d383eb1b4 Merge: 76b55fde8 2e74edb53 Author: Nick Mathewson Date: Wed Mar 6 14:29:29 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2019-03-04 | 4 + src/config/geoip | 12163 - src/config/geoip6| 2251 ++--- 3 files changed, 8221 insertions(+), 6197 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 76b55fde815f3f61161ba21adf90154fc2e53907 Merge: be71cce9f 7786198ee Author: teor Date: Fri Mar 1 14:15:59 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 3313444ef08b891d344b1965a7776260c02f27ab Merge: 6c966b894 4d9eb4dd0 Author: teor Date: Thu Feb 28 10:45:30 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug29599 | 3 +++ src/test/test_shared_random.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.3
commit 6c966b894c2115d18ad5aecc7d02e7b96fea1daf Merge: fb309f6eb 4417ac880 Author: teor Date: Wed Feb 27 09:37:36 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug29145| 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/test/test-memwipe.c index 89d946d50,c650b99c8..4beb61369 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@@ -39,10 -36,11 +39,11 @@@ const char *s = NULL sum += (unsigned char)buf[i]; \ } -#ifdef __OpenBSD__ +#ifdef OpenBSD /* Disable some of OpenBSD's malloc protections for this test. This helps * us do bad things, such as access freed buffers, without crashing. */ - const char *malloc_options="sufjj"; + extern const char *malloc_options; + const char *malloc_options = "sufjj"; #endif static unsigned ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
