Merge branch 'hotfix/0.25.3'

felliott · felliott · commit 68ede65f8c46 · 2018-04-03T17:29:45.000-04:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,12 @@
 ChangeLog
 *********
 
+0.25.3 (2018-04-03)
+===================
+- Fix: Add a subprocess timeout to the unoconv exporter so MFR doesn't wait forever for a process
+that might not complete.
+- Feature: Add user-agent to tornado access logs to help identify spiders.
+
 0.25.2 (2018-03-29)
 ===================
 - Fix: Release memory consumed during csv-rendering process and force a garbage-collect cycle to
diff --git a/mfr/version.py b/mfr/version.py
@@ -1 +1 @@
-__version__ = '0.25.2'
+__version__ = '0.25.3'
