Merge branch 'tr-integ' into debian

Merge in 3.0.7

Conflicts:
	debian/changelog
	debian/freeradius.logrotate
	src/main/version.c

diff --cc debian/changelog
index 6b66502,a5ae803..2586676
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,40 -1,20 +1,65 @@@
++freeradius (3.0.7+moonshot1-1) unstable; urgency=medium
++
++  * New moonshot release
++  * Include patch for trust router to compile
++  * Include memory leak fix
++
++ -- Sam Hartman <hartmans@debian.org>  Mon, 02 Mar 2015 16:16:34 -0500
++
+ freeradius (3.0.7+git) unstable; urgency=medium
+ 
+   * New upstream version.
+ 
+  -- Alan DeKok <aland@freeradius.org>  Wed, 17 Dec 2014 16:00:00 -0400
+ 
+ freeradius (3.0.6+git) unstable; urgency=medium
+ 
+   * New upstream version.
+ 
+  -- Alan DeKok <aland@freeradius.org>  Tue, 01 Nov 2014 08:30:00 -0400
+ 
+ freeradius (3.0.5+git) unstable; urgency=medium
+ 
+   * New upstream version.
+ 
+  -- Alan DeKok <aland@freeradius.org>  Thu, 23 Sep 2014 08:30:00 -0400
 +freeradius (3.0.4+moonshot1-6) unstable; urgency=medium
 +
 +  * Depend on make for freeradius-config
 +  * Update logrotate script
 +
 + -- Sam Hartman <hartmans@debian.org>  Mon, 03 Nov 2014 13:46:00 -0500
 +
 +freeradius (3.0.4+moonshot1-5) unstable; urgency=medium
 +
 +  * Fix segfault when psk_identity is not set in the configuration
 +  * Fix typo in psk query in  abfab-tls
 +
 + -- Sam Hartman <hartmans@debian.org>  Tue, 07 Oct 2014 21:19:49 -0400
 +
 +freeradius (3.0.4+moonshot1-4) unstable; urgency=medium
 +
 +  * Add freerad and trustrouter to each others' groups
 +
 + -- Sam Hartman <hartmans@debian.org>  Fri, 03 Oct 2014 10:41:53 -0400
 +
 +freeradius (3.0.4+moonshot1-3) unstable; urgency=medium
 +
 +  * No, config.status rather than build-arch-stamp needs to depend on patch
 +
 + -- Sam Hartman <hartmans@debian.org>  Fri, 26 Sep 2014 13:53:31 -0400
 +
 +freeradius (3.0.4+moonshot1-2) unstable; urgency=medium
 +
 +  * Rebuild to include trust router code
 +
 + -- Sam Hartman <hartmans@debian.org>  Mon, 22 Sep 2014 19:04:24 -0400
 +
 +freeradius (3.0.4+moonshot1-1) unstable; urgency=medium
 +
 +  * New moonshot patched version
 +
 + -- Sam Hartman <hartmans@debian.org>  Wed, 17 Sep 2014 15:12:10 -0400
  
  freeradius (3.0.4+git) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge

diff --cc src/main/tls.c
Simple merge

diff --cc src/main/version.c
Simple merge