Merge tag 'release_3_0_15' into tr-integ moonshot_release_3.0.15 moonshot_release_3.0.15+moonshot1 moonshot_release_3.0.15+moonshot1-1 moonshot_release_3.0.15+moonshot2
authorDan Breslau <dbreslau@painless-security.com>
Mon, 17 Jul 2017 18:05:09 +0000 (14:05 -0400)
committerDan Breslau <dbreslau@painless-security.com>
Mon, 17 Jul 2017 18:05:09 +0000 (14:05 -0400)
1  2 
debian/changelog
redhat/freeradius.spec-renamed
src/main/tls.c
suse/freeradius.spec-renamed

@@@ -1,9 -1,9 +1,21 @@@
++freeradius (3.0.15+moonshot1-0) unstable; urgency=medium
++
++  * Merged from upstream release_3.0.15
++
++ -- Painless Security <build@painless-security.com>  Mon, 17 Jul 2017 18:54:00 -0500
++
+ freeradius (3.0.15+git) unstable; urgency=medium
+   * New upstream version.
+  -- Alan DeKok <aland@freeradius.org>  Mon, 29 May 2017 12:00:00 -0400
 +freeradius (3.0.14+moonshot4-1) unstable; urgency=medium
 +
 +  * Merged from release_3.0.14
 +
 + -- Painless Security <build@painless-security.com>  Mon, 05 Jun 2017 19:03:00 -0400
 +
  freeradius (3.0.14+git) unstable; urgency=medium
  
    * New upstream version.
Simple merge
diff --cc src/main/tls.c
Simple merge
Simple merge