aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-22Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1446'Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge branch 'maint-0.4.0' into maint-0.4.1Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1Nick Mathewson
2019-10-22Re-run make autostyle.Nick Mathewson
2019-10-22Merge branch 'ticket31705_v2' into ticket31705_v2_mergedNick Mathewson
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-22test_addr.c: use COCCI to suppress macros coccinelle cannot parse.Nick Mathewson
2019-10-22test.h: Use COCCI to suppress macros Coccinelle does not understand.Nick Mathewson
2019-10-22threads.h: coccinelle cannot understand a macro.Nick Mathewson
2019-10-22ctassert.h: fix CTASSERT_DECL so coccinelle can parse it.Nick Mathewson
2019-10-22ratelim.h: use COCCI to hide an initializer.Nick Mathewson
2019-10-22util_bug.h: Coccinelle does not understand IF_BUG_ONCE or #nodef.Nick Mathewson
2019-10-22weakrng.h: use COCCI to hide a macro coccinelle cannot parse.Nick Mathewson
2019-10-22Use STMT_BEGIN/END in parse_int.c so coccinelle can handle it.Nick Mathewson
2019-10-22smartlist.h: use COCCI to hide SMARTLIST_FOREACH_JOIN from CoccinelleNick Mathewson
2019-10-22namemap_st.h: Use COCCI to hide an initializer.Nick Mathewson
2019-10-22timeval.h: Coccinelle cannot understand timercmp.Nick Mathewson
2019-10-22Fix a macro in address.c so coccinelle can understand itNick Mathewson
2019-10-22timers.c: define TIMEOUT_PUBLIC to no tokens when using COCCI.Nick Mathewson
2019-10-22dispatch_naming.c: when COCCI is defined, disable unparseable macros.Nick Mathewson
2019-10-22conftesting.h: when COCCI is defined, disable unhandled macrosNick Mathewson
2019-10-22confmacros.h: fix coccinelle parsing.Nick Mathewson
2019-10-22feature/control: wrap some problem macros in COCCINick Mathewson
2019-10-22tor-coccinelle.h: add a definition for EXTERNNick Mathewson
2019-10-22consdiff disable a macro when running with COCCINick Mathewson
2019-10-22Disable a couple of iterator macros when COCCI is defined.Nick Mathewson
2019-10-22Use various COCCI tests to get mainloop.c to parse.Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion