commit d3ac47b4153fbe51ca63882ce63165abdf50901b Merge: 124e06e85 db6902c23 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 10 14:26:32 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-)

diff --cc src/or/include.am index abf62c2e8,7548ed094..4938ae8e7 --- a/src/or/include.am +++ b/src/or/include.am @@@ -156,7 -144,9 +156,8 @@@ endi

ORHEADERS = \ src/or/addressmap.h \ + src/or/auth_dirs.inc \ src/or/bridges.h \ - src/or/buffers.h \ src/or/channel.h \ src/or/channelpadding.h \ src/or/channeltls.h \