Merge branch 'maint-0.2.9' into maint-0.3.1

diff --cc src/or/config.c
Simple merge

diff --cc src/or/include.am
index 5d5ff5c41d139ca42ab440d7940b9e72b3c018cc,19cf00264bab9dc5948d9ee483b09d06506e4fcc..7548ed0946301e1356bb0c82cc639a0f2496b51d
--- 1/src/or/include.am
--- 2/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                           \