all: sync with master; upd chlog

client/src/reducers/dnsConfig.js

@@ -15,6 +15,7 @@ const dnsConfig = handleActions(
                 blocking_ipv4,
                 blocking_ipv6,
                 upstream_dns,
+                fallback_dns,
                 bootstrap_dns,
                 local_ptr_upstreams,
                 ...values
@@ -26,6 +27,7 @@ const dnsConfig = handleActions(
                 blocking_ipv4: blocking_ipv4 || DEFAULT_BLOCKING_IPV4,
                 blocking_ipv6: blocking_ipv6 || DEFAULT_BLOCKING_IPV6,
                 upstream_dns: (upstream_dns && upstream_dns.join('\n')) || '',
+                fallback_dns: (fallback_dns && fallback_dns.join('\n')) || '',
                 bootstrap_dns: (bootstrap_dns && bootstrap_dns.join('\n')) || '',
                 local_ptr_upstreams: (local_ptr_upstreams && local_ptr_upstreams.join('\n')) || '',
                 processingGetConfig: false,

client/src/reducers/services.js

@@ -20,9 +20,9 @@ const services = handleActions(
             processingAll: false,
         }),
 
-        [actions.setBlockedServicesRequest]: (state) => ({ ...state, processingSet: true }),
-        [actions.setBlockedServicesFailure]: (state) => ({ ...state, processingSet: false }),
-        [actions.setBlockedServicesSuccess]: (state) => ({
+        [actions.updateBlockedServicesRequest]: (state) => ({ ...state, processingSet: true }),
+        [actions.updateBlockedServicesFailure]: (state) => ({ ...state, processingSet: false }),
+        [actions.updateBlockedServicesSuccess]: (state) => ({
             ...state,
             processingSet: false,
         }),
@@ -31,7 +31,7 @@ const services = handleActions(
         processing: true,
         processingAll: true,
         processingSet: false,
-        list: [],
+        list: {},
         allServices: [],
     },
 );

client/src/reducers/stats.js

@@ -58,6 +58,8 @@ const stats = handleActions(
                 num_replaced_safebrowsing: numReplacedSafebrowsing,
                 num_replaced_safesearch: numReplacedSafesearch,
                 avg_processing_time: avgProcessingTime,
+                top_upstreams_responses: topUpstreamsResponses,
+                top_upstrems_avg_time: topUpstreamsAvgTime,
             } = payload;
 
             const newState = {
@@ -77,6 +79,8 @@ const stats = handleActions(
                 numReplacedSafebrowsing,
                 numReplacedSafesearch,
                 avgProcessingTime,
+                topUpstreamsResponses,
+                topUpstreamsAvgTime,
             };
 
             return newState;