Nick Mathewson
5597ddc360
Mark openbsd-malloc as deprecated
2018-08-03 07:38:47 -04:00
Nick Mathewson
bb1f294232
Merge branch 'with_malloc_squashed'
2018-08-03 07:35:23 -04:00
Nick Mathewson
abde9fb426
Add a --with-malloc option.
...
Based on a patch from Hello71 on ticket 20424.
This patch additionally fixes openbsd-malloc support, switches
our tcmalloc support to use pkgconfig, and tells the compiler to
omit system malloc implementations as appropriate.
squash! Add a --with-malloc option.
Edit changelog file to fix a typo and credit Alex Xu in preferred format.
2018-08-03 07:34:40 -04:00
Nick Mathewson
ae157b79e7
Merge branch 'maint-0.3.4'
2018-08-03 07:33:45 -04:00
Nick Mathewson
be8e56c231
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-03 07:33:45 -04:00
Nick Mathewson
2a6c1585b0
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-03 07:33:45 -04:00
Nick Mathewson
4856a6e6c4
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-03 07:33:45 -04:00
Nick Mathewson
42c6ebda16
Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9
2018-08-03 07:33:39 -04:00
Nick Mathewson
622a057e7e
Merge remote-tracking branch 'public/string_coverage'
2018-08-03 07:03:29 -04:00
Nick Mathewson
861d690018
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-01 14:37:07 -04:00
Nick Mathewson
af97879446
Merge branch 'maint-0.3.4'
2018-08-01 14:37:07 -04:00
Nick Mathewson
eb604f5faa
Fix build on GNU/Hurd. Patch from paulusASol. Closes 26873.
2018-08-01 14:37:03 -04:00
Nick Mathewson
7e4ac0283e
Merge remote-tracking branch 'teor/bug26986'
2018-07-31 08:50:38 -04:00
Nick Mathewson
01c73711f1
Merge branch 'maint-0.3.4'
2018-07-31 08:30:58 -04:00
Nick Mathewson
bcce3e7e0b
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-31 08:30:01 -04:00
Nick Mathewson
373b23a9ee
Merge remote-tracking branch 'teor/bug26876_033' into maint-0.3.3
2018-07-31 08:29:54 -04:00
Nick Mathewson
d66cfadbd3
Merge remote-tracking branch 'teor/bug26979'
2018-07-31 08:26:15 -04:00
Nick Mathewson
de4d7c3837
Merge branch 'ticket26447'
2018-07-31 08:21:10 -04:00
Roger Dingledine
fe9f585143
fix wrong word in comment
2018-07-30 22:35:33 -04:00
teor
c3fca338a2
Appveyor CI: always use HEAD for the short commit
...
Part of 26979.
2018-07-31 12:14:40 +10:00
teor
fcc8480093
Appveyor CI: Changes file for 26979
...
Closes 26979.
2018-07-31 11:58:04 +10:00
teor
c6973aeccb
Appveyor CI: sort environmental variables
...
To avoid future duplicates.
2018-07-31 11:54:02 +10:00
teor
02a45b3ea4
Appveyor CI: fix some typos
2018-07-31 11:49:11 +10:00
teor
019c31bbf8
Appveyor CI: Generate correct tag names
...
Part of 26979.
2018-07-31 11:47:33 +10:00
teor
3d3e62d147
Appveyor CI: Switch to one URL per line
...
Part of 26979.
2018-07-31 11:37:11 +10:00
teor
9118430b14
Use Windows-compatible format strings in tor-print-ed-signing-cert.c
...
Fixes bug 26986; bugfix on master.
2018-07-31 11:21:28 +10:00
teor
e26794ace9
Add TOR_PRIdSZ to torint.h
2018-07-31 11:21:28 +10:00
teor
9b41eb2bc3
Appveyor CI: Generate correct branches and URLs for pull requests
...
Part of 26979.
2018-07-31 11:13:20 +10:00
teor
861db8c4ae
Appveyor CI: Make short commits 10 hexdigits long
...
That's what git does for tor.
Part of 26979.
2018-07-31 11:13:17 +10:00
teor
fc9f8c28fb
Appveyor CI: Fix GitHub provider detection
...
Part of 26979.
2018-07-31 11:13:10 +10:00
Nick Mathewson
acb54dee7b
Remove a now-obsolete comment about deadcode_dummy__
2018-07-30 09:09:10 -04:00
Nick Mathewson
70b16bc679
Merge branch 'ticket26890'
2018-07-30 09:08:39 -04:00
Nick Mathewson
aeffbe5101
Run check-includes.py script with detected python path.
2018-07-30 09:07:19 -04:00
Nick Mathewson
21babc8d3f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-30 09:01:59 -04:00
Nick Mathewson
ba1bb90a72
Merge branch 'maint-0.3.4'
2018-07-30 09:01:59 -04:00
Nick Mathewson
3a6bd21440
Merge remote-tracking branch 'teor/bug26627_033_merged_master'
2018-07-30 09:01:55 -04:00
Nick Mathewson
4f854dbdc2
Merge remote-tracking branch 'teor/bug26627_033' into maint-0.3.3
2018-07-30 09:01:45 -04:00
Nick Mathewson
49d8a2109f
Update include in tor-print-ed-signing-cert
2018-07-30 08:57:18 -04:00
Nick Mathewson
ff593ae878
Merge remote-tracking branch 'rl1987/feature19506_3'
2018-07-30 08:55:57 -04:00
Nick Mathewson
13393b2d91
Merge remote-tracking branch 'rl1987/ticket21349_4'
2018-07-30 08:49:49 -04:00
Nick Mathewson
7d66ec0feb
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-30 08:45:01 -04:00
Nick Mathewson
a159eaf45f
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-30 08:45:01 -04:00
Nick Mathewson
b8e94b2f1d
Merge branch 'maint-0.3.4'
2018-07-30 08:45:01 -04:00
Nick Mathewson
ec1ced3cc1
Merge remote-tracking branch 'teor/bug26924'
2018-07-30 08:44:58 -04:00
Nick Mathewson
fea35ddf00
Merge remote-tracking branch 'teor/bug26924_032' into maint-0.3.2
2018-07-30 08:44:40 -04:00
Nick Mathewson
ac9d08f66a
Merge remote-tracking branch 'juga/ticket3723_03_squashed_rebased'
2018-07-30 08:33:59 -04:00
Nick Mathewson
811ed8cf9f
Merge remote-tracking branch 'rl1987/bug26892_take2'
2018-07-30 08:24:14 -04:00
Nick Mathewson
d102e9c2e4
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-30 08:17:25 -04:00
Nick Mathewson
5823e62fa2
Merge branch 'maint-0.3.4'
2018-07-30 08:17:25 -04:00
Nick Mathewson
15d7f24c57
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-30 08:17:24 -04:00