Nick Mathewson
d08d29f15f
Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1
2019-10-22 12:53:06 -04:00
Nick Mathewson
7d75e1dbdf
Merge remote-tracking branch 'tor-github/pr/1446'
2019-10-22 12:52:32 -04:00
Nick Mathewson
730f0e3da3
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:51:33 -04:00
Nick Mathewson
3989dd1616
Merge branch 'maint-0.4.2'
2019-10-22 12:51:33 -04:00
Nick Mathewson
b588b60876
Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1
2019-10-22 12:51:27 -04:00
Nick Mathewson
9537966a0b
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:15:14 -04:00
Nick Mathewson
4d43e1bf4f
Merge branch 'maint-0.4.2'
2019-10-22 12:15:14 -04:00
Nick Mathewson
9769df89fe
Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1
2019-10-22 12:15:06 -04:00
Nick Mathewson
f58439ee55
Merge branch 'maint-0.4.2'
2019-10-22 12:13:56 -04:00
Nick Mathewson
c55c75bc97
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:13:55 -04:00
Nick Mathewson
c1bf4260b6
Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1
2019-10-22 12:13:47 -04:00
Nick Mathewson
3939bb82f0
Merge branch 'maint-0.4.2'
2019-10-22 12:11:59 -04:00
Nick Mathewson
34f3d8d407
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:11:59 -04:00
Nick Mathewson
d4dde249a0
Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1
2019-10-22 12:11:50 -04:00
Nick Mathewson
4013e50cb7
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-22 12:10:30 -04:00
Nick Mathewson
da59dee5d4
Merge branch 'maint-0.4.2'
2019-10-22 12:10:30 -04:00
Nick Mathewson
e5b9eefb02
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:10:30 -04:00
Nick Mathewson
6965798a16
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-22 12:10:30 -04:00
Nick Mathewson
21c3488af7
Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5
2019-10-22 12:10:08 -04:00
Nick Mathewson
8d7015eb8b
Merge branch 'maint-0.4.2'
2019-10-22 12:08:53 -04:00
Nick Mathewson
cbc67241db
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:08:53 -04:00
Nick Mathewson
4c8af10f0e
Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1
2019-10-22 12:08:46 -04:00
Nick Mathewson
931a5db2a7
Re-run make autostyle.
2019-10-22 09:40:31 -04:00
Nick Mathewson
b2d487ae22
Merge branch 'ticket31705_v2' into ticket31705_v2_merged
...
Conflicts:
src/feature/dirparse/authcert_parse.c
src/feature/dirparse/ns_parse.c
src/feature/hs/hs_service.c
src/lib/conf/conftesting.h
src/lib/log/log.h
src/lib/thread/threads.h
src/test/test_options.c
These conflicts were mostly related to autostyle improvements, with
one or two due to doxygen fixes.
2019-10-22 09:39:06 -04:00
Nick Mathewson
7e7a4874b8
test_addr.c: use COCCI to suppress macros coccinelle cannot parse.
2019-10-22 09:32:13 -04:00
Nick Mathewson
0da349aa5e
test.h: Use COCCI to suppress macros Coccinelle does not understand.
2019-10-22 09:32:13 -04:00
Nick Mathewson
0b862a7616
threads.h: coccinelle cannot understand a macro.
2019-10-22 09:32:13 -04:00
Nick Mathewson
4346e5569e
ctassert.h: fix CTASSERT_DECL so coccinelle can parse it.
2019-10-22 09:32:13 -04:00
Nick Mathewson
189375fb5d
ratelim.h: use COCCI to hide an initializer.
2019-10-22 09:32:13 -04:00
Nick Mathewson
c77f57d37b
util_bug.h: Coccinelle does not understand IF_BUG_ONCE or #nodef.
2019-10-22 09:32:13 -04:00
Nick Mathewson
fb4b6b6436
weakrng.h: use COCCI to hide a macro coccinelle cannot parse.
2019-10-22 09:32:13 -04:00
Nick Mathewson
d1cdb1a24e
Use STMT_BEGIN/END in parse_int.c so coccinelle can handle it.
2019-10-22 09:32:13 -04:00
Nick Mathewson
41f44d8760
smartlist.h: use COCCI to hide SMARTLIST_FOREACH_JOIN from Coccinelle
2019-10-22 09:32:13 -04:00
Nick Mathewson
514c61e406
namemap_st.h: Use COCCI to hide an initializer.
2019-10-22 09:32:13 -04:00
Nick Mathewson
2695f7e68c
timeval.h: Coccinelle cannot understand timercmp.
2019-10-22 09:32:13 -04:00
Nick Mathewson
9f50a92a7e
Fix a macro in address.c so coccinelle can understand it
2019-10-22 09:32:13 -04:00
Nick Mathewson
0abe89519b
timers.c: define TIMEOUT_PUBLIC to no tokens when using COCCI.
2019-10-22 09:32:13 -04:00
Nick Mathewson
9453746b5e
dispatch_naming.c: when COCCI is defined, disable unparseable macros.
2019-10-22 09:32:13 -04:00
Nick Mathewson
04a74d4aa7
conftesting.h: when COCCI is defined, disable unhandled macros
2019-10-22 09:32:13 -04:00
Nick Mathewson
3e41459dff
confmacros.h: fix coccinelle parsing.
2019-10-22 09:32:13 -04:00
Nick Mathewson
54c5366aa1
feature/control: wrap some problem macros in COCCI
2019-10-22 09:32:13 -04:00
Nick Mathewson
d6ce8527f8
tor-coccinelle.h: add a definition for EXTERN
2019-10-22 09:32:13 -04:00
Nick Mathewson
ef5d1e6b65
consdiff disable a macro when running with COCCI
2019-10-22 09:32:13 -04:00
Nick Mathewson
d9bad0203b
Disable a couple of iterator macros when COCCI is defined.
2019-10-22 09:32:13 -04:00
Nick Mathewson
67247fa9ac
Use various COCCI tests to get mainloop.c to parse.
2019-10-22 09:32:13 -04:00
Nick Mathewson
4fad456148
test: Hide some test-declaration macro definitions to COCCI.
...
(These ones cause parsing failures.)
2019-10-22 09:32:13 -04:00
Nick Mathewson
6696a5bbae
tor-coccinelle.h: add HANDLE_{DECL,IMPL}
2019-10-22 09:32:13 -04:00
Nick Mathewson
d129b503c0
tor-coccinelle.h: add EAT_SEMICOLON
2019-10-22 09:32:13 -04:00
Nick Mathewson
c1e8e5bb32
Apparently coccinelle can't handle multiline #errors.
2019-10-22 09:32:13 -04:00
Nick Mathewson
b03c8c74ce
COCCI: Disable some buffers.c macros that coccinelle can't handle.
2019-10-22 09:32:13 -04:00
