Merge tag 'release_3_0_10' into tr-integ
authorSam Hartman <hartmans@debian.org>
Mon, 16 Nov 2015 15:11:12 +0000 (10:11 -0500)
committerSam Hartman <hartmans@debian.org>
Mon, 16 Nov 2015 15:11:12 +0000 (10:11 -0500)
commitdc7172d75f36fe7364254deff8a5dc408be06de6
tree72cd29a05497456ee9dc5c81971aee46adea0bfe
parentf30b2369b672e95d35d6000a5aeae5de0b08e004
parentd33a1dcd2591773fd3d0adde592dfad73c2088ed
Merge tag 'release_3_0_10' into tr-integ

Conflicts:
raddb/mods-config/attr_filter/access_reject
src/main/tls.c
src/main/tls_listen.c
src/modules/rlm_realm/rlm_realm.c
src/modules/rlm_realm/trustrouter.c
raddb/mods-config/attr_filter/access_reject
src/main/tls.c
src/main/tls_listen.c
src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c