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

..

api

Re-run "make autostyle" with improved annotate_ifdef_directives

2019-09-30 08:57:37 -04:00

client

feature: Move proxy_mode() into new files

2019-10-20 17:52:38 +10:00

control

Merge branch 'ticket31705_v2' into ticket31705_v2_merged

2019-10-22 09:39:06 -04:00

dirauth

Merge branch 'ticket31705_v2' into ticket31705_v2_merged

2019-10-22 09:39:06 -04:00

dircache

Merge remote-tracking branch 'tor-github/pr/1434'

2019-10-21 15:24:22 +10:00

dirclient

Run "make autostyle."

2019-06-05 09:33:35 -04:00

dircommon

Merge branch 'ticket31705_v2' into ticket31705_v2_merged

2019-10-22 09:39:06 -04:00

dirparse

With coccinelle, avoid includes in the middle of an expression.

2019-10-22 09:24:25 -04:00

hibernate

hibernate: Fix repeated "bytes" in comment

2019-10-20 22:08:23 +10:00

hs

Merge branch 'ticket31705_v2' into ticket31705_v2_merged

2019-10-22 09:39:06 -04:00

hs_common

Run "make autostyle."

2019-06-05 09:33:35 -04:00

keymgt

Doxygen: fix warnings about mismatched HTML tags.

2019-10-16 08:27:03 -04:00

nodelist

Merge remote-tracking branch 'tor-github/pr/1434'

2019-10-21 15:24:22 +10:00

relay

Merge branch 'ticket31705_v2' into ticket31705_v2_merged

2019-10-22 09:39:06 -04:00

rend

Merge branch 'maint-0.4.2'

2019-10-20 05:56:16 -04:00

stats

Doxygen: Fix mismatched filenames.

2019-10-16 08:18:26 -04:00