[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug-13163-AlternateAuthorities-type-handling-fixed'

[nickm at torproject.org]

commit e5f9f287ced36e18241e250d4b63603b9c4f006f
Merge: cc5571e 31bf8f2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 9 10:55:09 2014 -0400

    Merge remote-tracking branch 'teor/bug-13163-AlternateAuthorities-type-handling-fixed'

 changes/bug13163-bitwise-check-BRIDGE-DIRINFO            |    5 +++++
 ...AlternateAuthorities-always-using-default-authorities |    4 ++++
 changes/issue13163-improve-DIRINFO-flags-comments        |    5 +++++
 src/or/config.c                                          |   14 ++++++++++----
 src/or/directory.c                                       |   12 ++++++------
 src/or/entrynodes.c                                      |   13 ++++++++-----
 src/or/routerlist.c                                      |    2 +-
 7 files changed, 39 insertions(+), 16 deletions(-)