Merge remote-tracking branch 'upstream/clearnet' into integration-test-logs-rebased

test/index.html

@@ -492,13 +492,14 @@
   <script type="text/javascript" src="test.js"></script>
 
   <script type="text/javascript" src="../js/registration.js" data-cover></script>
-  <script type="text/javascript" src="../js/expire.js" data-cover></script>
   <script type="text/javascript" src="../js/chromium.js" data-cover></script>
   <script type="text/javascript" src="../js/database.js" data-cover></script>
   <script type="text/javascript" src="../js/storage.js" data-cover></script>
   <script type="text/javascript" src="../js/signal_protocol_store.js" data-cover></script>
   <script type="text/javascript" src="../js/libtextsecure.js" data-cover></script>
   <script type="text/javascript" src="../js/libloki.js" data-cover></script>
+  <!-- needs the network comms libraries to work -->
+  <script type="text/javascript" src="../js/expire.js" data-cover></script>
 
   <script type="text/javascript" src="../js/models/messages.js" data-cover></script>
   <script type="text/javascript" src="../js/models/conversations.js" data-cover></script>