[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm@xxxxxxxxxxxxxx]

commit db6902c23530f8d58e999701685e9cbd74b15a82
Merge: e813116d3 10a1969ca
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Apr 10 14:26:29 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

 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 5d5ff5c41,19cf00264..7548ed094
--- a/src/or/include.am
+++ b/src/or/include.am
@@@ -144,10 -127,9 +144,11 @@@ 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				\
  	src/or/circpathbias.h				\
  	src/or/circuitbuild.h				\



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits