master..0d28fd2 · searx

git.iko.soy/searx

36 files changed+188−1250

unifiedsplit

.github/workflows/data-update.yml+1−1 .github/workflows/integration.yml+3−32 .gitignore−2 .pylintrc+1−1 Dockerfile+4−5 docs/dev/engine_overview.rst+1−1 manage+4−4 requirements-dev.txt+12−13 requirements.txt+5−5 searx/autocomplete.py+7−24 searx/data/ahmia_blacklist.txt−557 searx/data/useragents.json+3−4 searx/data/wikidata_units.json−1 searx/engines/__init__.py+1−1 searx/engines/command.py+1−1 searx/engines/gigablast.py+13−24 searx/engines/google.py+11−20 searx/engines/mysql_server.py−2 searx/engines/prowlarr.py−80 searx/engines/qwant.py+1−1 searx/engines/startpage.py+20−100 searx/engines/tineye.py−86 searx/engines/xpath_flex.py−121 searx/engines/yggtorrent.py+2−2 searx/network/__init__.py+27−26 searx/network/client.py+23−14 searx/network/network.py−8 searx/results.py+2−8 searx/search/checker/impl.py+1−1 searx/search/processors/online.py+3−4 searx/settings.yml+14−44 searx/templates/oscar/result_templates/products.html+1−2 searx/utils.py+6−12 searx/webapp.py+14−42 tests/unit/test_external_bangs.py+6 utils/searx.sh+1−1

.github/workflows/data-update.yml+1−1

@@ -29,7 +29,7 @@ jobs:

2929 - name: Set up Python

3030 uses: actions/setup-python@v2

3131 with:

32− python-version: '3.10'

32+ python-version: '3.9'

3333 architecture: 'x64'

3434

3535 - name: Install Python dependencies

.github/workflows/integration.yml+3−32

@@ -13,7 +13,7 @@ jobs:

1313 strategy:

1414 matrix:

1515 os: [ubuntu-20.04]

16− python-version: [3.7, 3.8, 3.9, "3.10"]

16+ python-version: [3.6, 3.7, 3.8, 3.9]

1717 steps:

1818 - name: Checkout

1919 uses: actions/checkout@v2

@@ -56,17 +56,6 @@ jobs:

5656 uses: actions/checkout@v2

5757 - name: Install Ubuntu packages

5858 run: sudo ./utils/searx.sh install packages

59− - name: Set up Python

60− uses: actions/setup-python@v2

61− with:

62− python-version: '3.9'

63− architecture: 'x64'

64− - name: Cache Python dependencies

65− id: cache-python

66− uses: actions/cache@v2

67− with:

68− path: ./local

69− key: python-ubuntu-20.04-3.9-${{ hashFiles('requirements*.txt', 'setup.py') }}

7059 - name: Install node dependencies

7160 run: make V=1 node.env

7261 - name: Build themes

@@ -79,21 +68,14 @@ jobs:

7968 - name: Checkout

8069 uses: actions/checkout@v2

8170 with:

82− fetch-depth: '0'

8371 persist-credentials: false

8472 - name: Install Ubuntu packages

8573 run: sudo ./utils/searx.sh install buildhost

8674 - name: Set up Python

8775 uses: actions/setup-python@v2

8876 with:

89− python-version: '3.10'

77+ python-version: '3.9'

9078 architecture: 'x64'

91− - name: Cache Python dependencies

92− id: cache-python

93− uses: actions/cache@v2

94− with:

95− path: ./local

96− key: python-ubuntu-20.04-3.9-${{ hashFiles('requirements*.txt', 'setup.py') }}

9779 - name: Build documentation

9880 run: |

9981 make V=1 docs.clean docs.html

@@ -115,7 +97,7 @@ jobs:

11597 - documentation

11698 env:

11799 DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}

118− runs-on: ubuntu-20.04

100+ runs-on: ubuntu-18.04

119101 steps:

120102 - name: Checkout

121103 if: env.DOCKERHUB_USERNAME != null

@@ -123,17 +105,6 @@ jobs:

123105 with:

124106 # make sure "make docker.push" can get the git history

125107 fetch-depth: '0'

126− - name: Set up Python

127− uses: actions/setup-python@v2

128− with:

129− python-version: '3.9'

130− architecture: 'x64'

131− - name: Cache Python dependencies

132− id: cache-python

133− uses: actions/cache@v2

134− with:

135− path: ./local

136− key: python-ubuntu-20.04-3.9-${{ hashFiles('requirements*.txt', 'setup.py') }}

137108 - name: Set up QEMU

138109 if: env.DOCKERHUB_USERNAME != null

139110 uses: docker/setup-qemu-action@v1

.gitignore−2

@@ -26,5 +26,3 @@ dist/

2626local/

2727gh-pages/

2828searx.egg-info/

29−.env

30−geckodriver.log

.pylintrc+1−1

@@ -59,7 +59,7 @@ confidence=

5959# --enable=similarities". If you want to run only the classes checker, but have

6060# no Warning level messages displayed, use"--disable=all --enable=classes

6161# --disable=W"

62−disable=bad-whitespace, duplicate-code, consider-using-f-string

62+disable=bad-whitespace, duplicate-code

6363

6464# Enable the message, report, category or checker with the given id(s). You can

6565# either give multiple identifier separated by comma (,) or put this option

Dockerfile+4−5

@@ -1,4 +1,4 @@

1−FROM alpine:3.15

1+FROM alpine:3.12

22ENTRYPOINT ["/sbin/tini","--","/usr/local/searx/dockerfiles/docker-entrypoint.sh"]

33EXPOSE 8080

44VOLUME /etc/searx

@@ -46,19 +46,18 @@ RUN apk upgrade --no-cache \

4646 uwsgi \

4747 uwsgi-python3 \

4848 brotli \

49− && pip3 install --upgrade pip wheel setuptools \

49+ && pip3 install --upgrade pip \

5050 && pip3 install --no-cache -r requirements.txt \

5151 && apk del build-dependencies \

5252 && rm -rf /root/.cache

5353

54−COPY searx ./searx

55−COPY dockerfiles ./dockerfiles

54+COPY --chown=searx:searx . .

5655

5756ARG TIMESTAMP_SETTINGS=0

5857ARG TIMESTAMP_UWSGI=0

5958ARG VERSION_GITCOMMIT=unknown

6059

61−RUN /usr/bin/python3 -m compileall -q searx; \

60+RUN su searx -c "/usr/bin/python3 -m compileall -q searx"; \

6261 touch -c --date=@${TIMESTAMP_SETTINGS} searx/settings.yml; \

6362 touch -c --date=@${TIMESTAMP_UWSGI} dockerfiles/uwsgi.ini; \

6463 if [ ! -z $VERSION_GITCOMMIT ]; then\

docs/dev/engine_overview.rst+1−1

@@ -171,7 +171,7 @@ headers set HTTP header information

171171data set HTTP data information

172172cookies set HTTP cookies

173173verify bool Performing SSL-Validity check

174−follow_redirects bool Follow redirects

174+allow_redirects bool Follow redirects

175175max_redirects int maximum redirects, hard limit

176176soft_max_redirects int maximum redirects, soft limit. Record an error but don't stop the engine

177177raise_for_httperror bool True by default: raise an exception if the HTTP code of response is >= 300

manage+4−4

@@ -13,7 +13,7 @@ source_dot_config

1313

1414PY_SETUP_EXTRAS='[test]'

1515NPM_PACKAGES="less@2.7 less-plugin-clean-css grunt-cli"

16−GECKODRIVER_VERSION="v0.30.0"

16+GECKODRIVER_VERSION="v0.28.0"

1717# SPHINXOPTS=

1818

1919# These py files are linted by test.pylint(), all other files are linted by

@@ -224,7 +224,7 @@ docker.build() {

224224

225225 # build Docker image

226226 build_msg DOCKER "Building image ${SEARX_IMAGE_NAME}:${SEARX_GIT_VERSION}"

227− docker build \

227+ sudo docker build \

228228 --build-arg GIT_URL="${GIT_URL}" \

229229 --build-arg SEARX_GIT_VERSION="${SEARX_GIT_VERSION}" \

230230 --build-arg VERSION_GITCOMMIT="${VERSION_GITCOMMIT}" \

@@ -236,8 +236,8 @@ docker.build() {

236236 -t "${SEARX_IMAGE_NAME}:latest" -t "${SEARX_IMAGE_NAME}:${SEARX_GIT_VERSION}" .

237237

238238 if [ "$1" = "push" ]; then

239− docker push "${SEARX_IMAGE_NAME}:latest"

240− docker push "${SEARX_IMAGE_NAME}:${SEARX_GIT_VERSION}"

239+ sudo docker push "${SEARX_IMAGE_NAME}:latest"

240+ sudo docker push "${SEARX_IMAGE_NAME}:${SEARX_GIT_VERSION}"

241241 fi

242242 )

243243 dump_return $?

requirements-dev.txt+12−13

@@ -1,20 +1,19 @@

11mock==4.0.3

22nose2[coverage_plugin]==0.10.0

33cov-core==1.15.0

4−pycodestyle==2.8.0

5−pylint==2.12.2

6−splinter==0.17.0

7−transifex-client==0.14.3; python_version < '3.10'

8−transifex-client==0.12.1; python_version == '3.10'

9−selenium==4.1.0

10−twine==3.7.1

11−Pallets-Sphinx-Themes==2.0.2

4+pycodestyle==2.7.0

5+pylint==2.10.2

6+splinter==0.15.0

7+transifex-client==0.14.3

8+selenium==3.141.0

9+twine==3.4.2

10+Pallets-Sphinx-Themes==2.0.1

1211docutils==0.16

13−Sphinx==4.4.0

14−sphinx-issues==3.0.1

15−sphinx-jinja==1.4.0

12+Sphinx==4.2.0

13+sphinx-issues==1.2.0

14+sphinx-jinja==1.1.1

1615sphinx-tabs==3.2.0

1716sphinxcontrib-programoutput==0.17

1817sphinx-autobuild==2021.3.14

19−linuxdoc==20211220

20−aiounittest==1.4.1

18+linuxdoc==20210324

19+aiounittest==1.4.0

requirements.txt+5−5

@@ -1,16 +1,16 @@

11certifi==2021.10.8

22babel==2.9.1

33flask-babel==2.0.0

4−flask==2.0.2

5−jinja2==3.0.3

6−lxml==4.7.1

4+flask==1.1.2

5+jinja2==3.0.2

6+lxml==4.6.3

77pygments==2.8.0

88python-dateutil==2.8.2

99pyyaml==6.0

10−httpx[http2]==0.21.3

10+httpx[http2]==0.19.0

1111Brotli==1.0.9

1212uvloop==0.16.0; python_version >= '3.7'

1313uvloop==0.14.0; python_version < '3.7'

14−httpx-socks[asyncio]==0.7.2

14+httpx-socks[asyncio]==0.4.1

1515langdetect==1.0.9

1616setproctitle==1.2.2

searx/autocomplete.py+7−24

@@ -24,7 +24,6 @@ from httpx import HTTPError

2424

2525

2626from searx import settings

27−from searx.data import ENGINES_LANGUAGES

2827from searx.network import get as http_get

2928from searx.exceptions import SearxEngineResponseException

3029

@@ -36,22 +35,6 @@ def get(*args, **kwargs):

3635 return http_get(*args, **kwargs)

3736

3837

39−def brave(query, lang):

40− # brave search autocompleter

41− url = 'https://search.brave.com/api/suggest?{query}'

42−

43− resp = get(url.format(query=urlencode({'q': query})))

44−

45− results = []

46−

47− if resp.ok:

48− data = loads(resp.text)

49− for suggestion in data[1]:

50− results.append(suggestion)

51−

52− return results

53−

54−

5538def dbpedia(query, lang):

5639 # dbpedia autocompleter, no HTTPS

5740 autocomplete_url = 'https://lookup.dbpedia.org/api/search.asmx/KeywordSearch?'

@@ -94,11 +77,12 @@ def google(query, lang):

9477

9578def startpage(query, lang):

9679 # startpage autocompleter

97− lui = ENGINES_LANGUAGES['startpage'].get(lang, 'english')

98− url = 'https://startpage.com/suggestions?{query}'

99− resp = get(url.format(query=urlencode({'q': query, 'segment': 'startpage.udog', 'lui': lui})))

100− data = resp.json()

101− return [e['text'] for e in data.get('suggestions', []) if 'text' in e]

80+ url = 'https://startpage.com/do/suggest?{query}'

81+

82+ resp = get(url.format(query=urlencode({'query': query}))).text.split('\n')

83+ if len(resp) > 1:

84+ return resp

85+ return []

10286

10387

10488def swisscows(query, lang):

@@ -136,8 +120,7 @@ def wikipedia(query, lang):

136120 return []

137121

138122

139−backends = {'brave': brave,

140− 'dbpedia': dbpedia,

123+backends = {'dbpedia': dbpedia,

141124 'duckduckgo': duckduckgo,

142125 'google': google,

143126 'startpage': startpage,

searx/data/ahmia_blacklist.txt−557

@@ -21,7 +21,6 @@

21210026fafbe1b7235b3a4d8eb854060517

222200290607695b936f1b9adad601928150

2323002ab3c58ec26372ca8a16fa04097fad

24−002b46dff2ce4613c330b92d4d71d0f0

2524002c81d45bb05fbbd77dd5eea0be3eae

2625002ca30d3c48fbabec4748d1ad8af561

2726002f82d895d220051c5c490f07bd2f06

@@ -55,7 +54,6 @@

5554005aa0ccff6de439ab4e4e628b0552af

5655005b01428e5ee8cc417a644bca40a5c2

5756005b7acb3c2804853e576aa65663bdce

58−0061c1bf5df10a523c4ab5576958a4b4

59570061c5b5415192023f7739d4ee9a5af5

605800622d07e1cdb94e1aa141662a0a62fd

61590064f431d0ddfdc3f6dfdccdeee12848

@@ -85,7 +83,6 @@

858300929b53c605e9e50cc818f382be038f

868400998ecf41af4b2a4fd0af9b905ed429

8785009a9d8c06a484906cbb5ddf6cdcc548

88−009dc638a21ee6eac7d6bb201916cac1

8986009e6a6fea5f7e294bf52a1b9b9fbec4

908700a150cf57d2a0f73f4467c40d15dc6f

918800a2d9e07f21e3cb1c9035e60393f552

@@ -153,11 +150,9 @@

153150010d9ec5dc9f06a8e9f96cdcec57f50d

154151010ea7123ee29776e390dba449cf9c5c

15515201110c139c92706867ecf10a66fff2b7

156−01112c8bd286e8f54f4a6960bc5f1ebf

1571530111f597eb58bcf715807b568b2a1d86

1581540112d1ebc8e2bddd8e1b2ee800dd15e6

15915501137cb5055be9e9e8f28231390439aa

160−011385fc99a8a4338d417d787c469303

1611560116d303c7f51659900e56455e80ddd9

16215701177c79cc4dae823970094c4822b6fb

163158011b5d530cece0a3fed2f1bee9a12256

@@ -317,7 +312,6 @@

31731202274c10044d60a4660b04aee89d38d5

31831302282271f3bc4c150f2ec1db5af6bfca

319314022d50338ff9502a3dfe34c4928b0762

320−022e619b0f3bd39d5996f8c01524e98b

32131502308eb942978927cc047c9dc98ca821

32231602338f61dcfc26b78eab670857683d91

323317023434be07b0f20b4c0633a67e3f68cd

@@ -332,7 +326,6 @@

33232602437a3d51e6c1b33bb2e3fe8be5e472

3333270245236428a5f036063fa6e2aa1564ef

33432802458a0d337e7dd8364f4bdf61a088ec

335−02464024db78d48112dd43c9b4ba6d17

3363290248a47ab75b938498a34463c56d1973

3373300248b116ecd91230882a25a65f7faeef

338331024b09b9bcdad171018d70220d049c4b

@@ -456,7 +449,6 @@

456449032b5f6cac2dfdf8b8839f3db71629a4

457450032db122dc5dbc4cffbd0e3b627130b8

45845103335b010c7d458cc1008c4649162849

459−0333fe7404cd8ec3503514a45ef899b7

460452033ab26e48d62c0251b1df6c407bf8c1

461453033bbca1d0b12eba0382a832869d595c

462454033e1cf13d22f08baf70113e58087714

@@ -764,7 +756,6 @@

76475605600a454c17ac66045de113dbcaaa0b

76575705608b4aa4af64fccff5c391070b7a95

7667580560a2aa066a84e1cd0cea4c9b3669cb

767−0560fc95bf1960ad3465c8f8346f4ac3

76875905629a329849675dbc855ddb2f30a030

7697600564aa25224fcde6f7ce48804b026826

77076105666f10162b8efc1aed3b9cc4640da0

@@ -897,7 +888,6 @@

89788806685edd26e0c9c00916bc0f7d18b9bd

8988890668a64fb9a6bd03e52a14f9ab7d0de3

899890066984aa7c1c764863bf7ef463f21d88

900−066a5962210d9e19c3cb13ba53897692

901891066bb32fc53b81636c16f0efe3ed4b7f

902892066bc0e33c79a70a523de34fa4663f9c

903893066bc6225f916973c337c85d11c71a13

@@ -917,7 +907,6 @@

91790706868ec175f1a7f63bcbcd75cd52021e

91890806870453f12b6634fb80cd34c2970fdb

91990906890d464ffdc2c0de3eb4bc716579c7

920−06894cd5ad4f95db3bdcb3d5239699a6

92191006897affbd01a6504d1dfd0ff6d64248

922911068dbe4d537dad2482594cc8c95af736

923912068dfeca71ed47d4783d078911f6f68e

@@ -932,7 +921,6 @@

9329210699a4c7c7ca258b8288eb762fe2d0f4

933922069bf1b5ece5331f43f294d12a015596

934923069d3997ddc5b2cf8a9d5ce552e77e80

935−069f973b036df806798862670b6d8bb6

93692406a2e096a6643cefa67dc90b198f7330

93792506a5c79201fae7f0bf7d3b0db3344f16

93892606a7408d6b96066373f9ad6ac3d8405d

@@ -1009,7 +997,6 @@

1009997071b7a890f5676749972e54979ce85cc

1010998071c4dde6d6625617de34d13634d9b91

1011999071e441f2b19555fa57e4071b82ad0fb

1012−071edaf1028d8b1618a2794471eea91d

10131000071f640ac3f78426db21b336b11c6cc4

10141001071fbe1ce5de68186033afa21258e162

101510020722443c456f887e45e19a6fe634201b

@@ -1127,7 +1114,6 @@

1127111407da155f5b679c64db6b08b0b88770d3

1128111507db784b509078fb0b00c5080afd2b95

1129111607dd3c18632efda46f7e37992997cc13

1130−07e05a07d7d189564382fa393a44b294

1131111707e46b8473c79acc80d9ea1bb37a1108

1132111807e629fc2615045100772d76afd37f46

1133111907e62e3d91e347884d791fc99ca8df16

@@ -1149,7 +1135,6 @@

1149113508048520d1143931ddc40214ab0fa949

115011360806ca6d476fd125103bf9acf94e93ff

115111370809e36b243d61464f89b21406dc059f

1152−080e852d3663838b1b4328b6b6b6c7ec

11531138081106d528ddbda7a3640f1eeb6f0e31

1154113908113f3ab8c4e3372205b5dfbf63c4e3

1155114008127862575c94ea7b935e832355570f

@@ -1202,7 +1187,6 @@

12021187086765ebf69c91c379f4c90aa3de176b

1203118808681f6e87d4897bc6b1096a0e737178

120411890868c84d232af450c2f7e7cece468141

1205−08691060fac3686183386b01064ea056

120611900869d08f8e7c01a99bc1c2ef5caf8542

12071191086a13be9f1cb2697537579bcc68c4f8

12081192086c23f66e6a00ac43387eac58297d8e

@@ -1252,7 +1236,6 @@

1252123608b7e8f6e0e65008e439d2a098f42b88

1253123708b8d16bdb34c0781de8335ad523c5e7

1254123808b9316ccb75723da6f5c99b5e20a0e0

1255−08bc42d3b93f705f88240b13f517c786

1256123908bc72ff8e9f3476c6f18c73efed3b3d

1257124008c15b037637db9a12d6ed64546f6bcf

1258124108c3f9013740af63e014e326ee0ebd1c

@@ -1445,7 +1428,6 @@

144514280a1cf347976b37c7169f2caf49202b96

144614290a1d7c682eccbf088c8953d77c1ba199

144714300a21bae70a0f4407b4c997f24b3458e5

1448−0a21d8b4aab7cae46c22024058ff4e48

144914310a246ad92b21a5f4562b39761c3e0bff

145014320a24b9acace735db35badb7c363c8b67

145114330a25bcd7ec874651b629df44483a2965

@@ -1492,13 +1474,11 @@

149214740a7b0ca4f197bced3fb77e3a10e5fe4d

149314750a7bed806fa74c05cd03adddb8b46def

149414760a7de060adf4be59403efa8a2c2b5fc9

1495−0a7fde9632b84114c2b27b5184d49f9d

149614770a8131ceceb4e34ed068c8889b9eca5e

149714780a82fc8bc070b11f9f3a647a2023f865

149814790a83f507727aa91b964140b30822786f

149914800a869a5ee6bba473166cc015f487d5eb

150014810a86d7cee84b1c74c6836b5435d4d184

1501−0a8b65b4f31263e9796bdba9bfe60364

150214820a8c3a73bf669ab7a319c2935de39c0a

150314830a8d4a78c16206937dc1543764e663a3

150414840a8f9e9a42d50771a6d02f262326e58c

@@ -1532,7 +1512,6 @@

153215120ac7546d43ce1d0ae7f50ef52f44fe8e

153315130ac7bfb6d3d3c11cd667655aa5bdcf19

153415140ac8020d4b6feafadc1d05ac1c230b18

1535−0ac8b2956b547d52fe8a6fba0627800a

153615150acba25d4448954630fcadfe86b19788

153715160ace573f0bdb40e0f5eae31307f04148

153815170acebed21123b9b3ab6f74b94653e54e

@@ -1577,8 +1556,6 @@

157715560b1e04e79e7fcf88906b256e159c1165

157815570b2161e4271374ea76a5a42e08aedbd4

157915580b21c031c7505e2e5564cf415700360d

1580−0b23d5cb7da9d57e894befaea1a1dbe9

1581−0b23fd90296356b4c2f02f73b13bcea2

158215590b24de38c8ddc8a94901840571bb9225

158315600b2ab129e154df85e1ef572ae6972d62

158415610b2be164b8795610b012c3a62f98a5ec

@@ -1602,7 +1579,6 @@

160215790b50054176eb76dbd0db47469a2c674a

160315800b506f8508bfdcd2a94a1cdbb6a86abf

160415810b51036353765cb7d620fe9535f3f84f

1605−0b516c083269fe9c5f2952d798e40658

160615820b52d83733c975490471610d585ff239

160715830b53bc66e3016620ee4b3af927d44637

160815840b55ffedb2eb824fbadb9b7d73cd9373

@@ -1664,7 +1640,6 @@

166416400bb515f4d60aefb9dcc77ccea6cceb38

166516410bb56d105bba424b8ecf75ac962e34f8

166616420bb978f51cf0d2ff421bd1731d076495

1667−0bbd73e5598225d04fcd64d101ac0b7e

166816430bbd9882fa33feea5af3694820bbe122

166916440bbfb01b2aa4ff123c3c34d16edd8327

167016450bc1f9f26f2adbf7627a468598d64ff4

@@ -1818,7 +1793,6 @@

181817930cc78daeac83e97e557d2015f8b3b97c

181917940cc7a3cfafc8373282977127bcd6b67f

182017950cc87829681460790e2c90d8c2582bba

1821−0cca0ff030356b8184164364342b01ab

182217960ccabb436f87e1cca31553dde65c12e9

182317970ccb730d9f4d2ee3aff4bd828581caee

182417980ccc0625f04f77b5ba39c441ba039f17

@@ -1865,7 +1839,6 @@

186518390d0c136f274ff16dbcf5565ca73b4f8b

186618400d0c27351b2c8da3fe3a85f05c18c623

186718410d0c6f0ee7f217b87cda6b34778541ff

1868−0d0f4f4e0a493ac6aa9de96389a94bb1

186918420d16397862d7ce918e02c9c638c7c372

187018430d1701d38fe96bb0f99a08a303c30cb9

187118440d171af6ab000d376e5a3f8941e91430

@@ -1882,7 +1855,6 @@

188218550d2ed1676e5b87dd52ce8a018f5d750d

188318560d31748dd012bfd45f543f6e25a7dbe7

188418570d325484f4c13489acae6d3b7d762c61

1885−0d37065f3c8d19f107b1b24540bbc659

188618580d37767ce986889d6641fa06293854c2

188718590d380e7e0790f512a4066014af8ac82c

188818600d3e2ec94521b5bdfbcedfcb7fb69092

@@ -2050,7 +2022,6 @@

205020220e72caa15ab2ea628abd0257fa15f468

205120230e736a09e9986ffc6e70b1a1751b4b44

205220240e75bec2ef3a0939a2990901eb667610

2053−0e75fe2072d580009f94ec4e53079815

205420250e78348146c815da304ba1ac4cea89e6

205520260e7846da88f00f8d1f181f06c97468c9

205620270e797f413e0a82f0e140121afb1a5b59

@@ -2119,7 +2090,6 @@

211920900ef10b927be418c643023890c2451e4c

212020910ef27063129ee230e92180aa0992a1fe

212120920ef32cdcc2a9bb9cfb1c8f645f3e6abd

2122−0ef4e6740b094d8fa2284d960bf09e03

212320930ef6282ec935b95a8d828206d36125d4

212420940ef824e995d84d472b82161c95c92540

212520950ef83cfa7eedf7387c9cb82cc73ce77b

@@ -2272,7 +2242,6 @@

227222420ffb26d29a23cb71cf0ed64cb53698d4

227322430ffbed1cdda7c40e39acf2fa5fc68c3b

227422440ffceb8ae6d1aeb996120d1de514db3e

2275−0ffe080d4b68079c405bbb7c45bf283c

227622450ffe4ed3b775c60f318791b4b23ffb09

227722461001305fc0cabacaa99cab32ecbb57c4

227822471003d8f11899378ea986f4e84cc98dd5

@@ -2358,7 +2327,6 @@

2358232710bfddd341c38bdfdda7019954993c22

2359232810c505971da74b2184a5483a5123d6b8

2360232910c644ebcac7b7a9af3693d483a6c7ab

2361−10c6bd12aa0afe2d89d6a3d90d1bb700

2362233010ca37900ef4ca41d54bc2a01b1e114c

2363233110ce92a25225610d91949d73d86ee95c

2364233210cf4ab5a4aeb7542fb26c176c0fe66b

@@ -2383,7 +2351,6 @@

2383235110fc5488af8bfbd440f04af11f1bccca

2384235210fd1043393f347d937844e4f7e0b296

2385235310fe79503b2d6008bc65b545bec4feae

2386−10ff864496e9548318aae7523fa67677

2387235411009862226b73c427ee4110f52208bf

238823551105607e7107615b03976eb3af09c8be

2389235611056a7a40fea6844e4551b87c8dd989

@@ -2407,7 +2374,6 @@

240723741124c4345681d53b3cc51bd9dea25a48

240823751124d4df22a7afc18595ce9a938d54f7

24092376112607c3124d29a51cc71d3d16eb4777

2410−1128ebed370cc8c5555856cbc2384374

24112377112dd50057613a5881277f75917e4805

24122378112de4585c243a58e98c749744c53acf

24132379112dfe847f7f6d80d8aea2f2c456b3d3

@@ -2433,7 +2399,6 @@

243323991145886091b199a2837bbb67cb3c9225

243424001146d2e9235992a099ab55371d1e5398

24352401114842e8ea39a081cce29167c5d5e353

2436−1149ee21885bfcb913177637c23fbdb4

24372402114b3c2879a08d9a4b8faf68122c805d

24382403114f9ee4cd90535daacb64cb5a1fc96f

2439240411517d554441e7e5281e55602406bcdd

@@ -2490,7 +2455,6 @@

2490245511b76eae548ed79cede3592c6bd50c30

2491245611b7782c8868c715771357bd87dc8422

2492245711ba2115d14f0451c999e8d63e29a294

2493−11baf91b20b0040b426fd4ed5845355b

2494245811bdd976861834ac9025e5f7681bff6e

2495245911be0d0ce8a1ca91041f8a7ff991022f

2496246011bfaa40f390a20c5b1d0b2a08a95726

@@ -2513,7 +2477,6 @@

2513247711d9af9fc714fd12988975a4a21f92ad

2514247811db55c2f325813feea16af3e6a433ea

2515247911db6ae6137ed18f695cd6a9a333b2b3

2516−11dc9f9743bfb9eae07f69b953b26426

2517248011deac2627b0bf1e7c81c4f026464dea

2518248111df5de877a48379b0f11611dc571e42

2519248211e3e1dad8585993f1360c6fea29326c

@@ -2665,7 +2628,6 @@

26652628131881688c24aeb84662f1bf4ffa6f34

26662629131dcbc5e15cfb747d829d1479af166c

2667263013201c16878e3ef9a97eea2e859e05f1

2668−13224811a83811db420021b1bec7b59e

266926311322c8e97f4a68d957c3513d5d57769e

26702632132368fd5de0bdfa83950b5726018c98

267126331323ada56bb235fdb3043c8bebcc4d9a

@@ -2706,7 +2668,6 @@

270626681361723797c7c0b1b468709f71efb4b7

27072669136416f89dc644c844558dda59162007

2708267013644c342bf91c00ffb7b6150b9e4ea1

2709−136508e272d0826799191dadda8bea61

2710267113671d538df10681fb4a6bd3f196fa3a

2711267213683fa48647fd8377f0e961a3121651

271226731368b418d08d979fd0ad4bf82ffbe2ff

@@ -2754,13 +2715,11 @@

2754271513c6dcc3911fd9e80b78cc118ad6a855

2755271613c714d1fc978d58ea56357d1d5219cd

2756271713c73da60d64b4b3b4a841e11290aed6

2757−13c81d82802fb195d1375a168dba834f

2758271813ca32082fbd23791283ebc0eecc0966

2759271913ca63f638ffbeda82970d4c2895fc70

2760272013cc674232435e22462275038cd55362

2761272113cc6e999717e8c0e5fc8def220bec54

2762272213cdb5dbdf77a501e116107603c03b8a

2763−13d18aec3e3a4020f6173d34bcde925d

2764272313d18d9635ffb0ca0d63fb618a2348af

2765272413d26abbcd4c895bf2f7b4a2e4be4389

2766272513d3a35f256205e9ecb9792a9431844a

@@ -2841,7 +2800,6 @@

284128001451986e8680aac14c0bf38330395d7a

284228011455a351ba9405fe99814a0bc38358b2

2843280214579e025738e15dcc87bc1a0837bda9

2844−145a01c3ca940dab1b16b2c214695dc6

28452803145a8aa1cb6e9fe8a28d158f818b2473

28462804145c2c96cb11b838fedbb7dc66d0dcbd

28472805145c89a0f78673b8c4653358fb80fc32

@@ -2856,7 +2814,6 @@

285628141475a2e5cd012ae4fb8b921202bb4da3

28572815147a65ba555cc0e49b13e63b53cba034

28582816147b92a414e32e270678eacd58bc4754

2859−147c1018686542faee057649a462d6f2

28602817147c9d7a91b0258a01258488e1862d33

28612818147d4ec7297d635475449cf6219ee315

28622819147f437dded2dbc2dc458cfa5e17b21c

@@ -2936,7 +2893,6 @@

29362893150203325a5b7df77628d1fee5bca833

293728941502d21cd4cb3e89f8b5d36ed9aea939

293828951507644a1f768138471019a124d38819

2939−15085cfc265776cb48b0e0e00fb644c7

2940289615087594c3b0e52c8d54f5304cc7ec3f

29412897150daba20b4b365421fd13b12a8134f3

29422898150dc1dd4904097b43b686d3d2b394c4

@@ -2946,7 +2902,6 @@

29462902151666e67158116410a7c9440fc4cfc4

29472903151810620f57e96fd73b48c529a3b6b1

294829041519b36be935a03c82aeedac12ec598f

2949−151b4da7790e808721ce7248956ce94c

29502905151f4bb9fddc5f83514540d429de7dbf

295129061520b243771693574535def2cb4438d4

295229071521398711c66ed4a4f4ff4e8f4c4d34

@@ -2985,7 +2940,6 @@

29852940155b055dc44952f5502674905dadb8ab

29862941155cbd90ab7cb71aac798370c8fc8af9

298729421560b3940ccff4d7ae0559e22e8d2200

2988−1561b174d9d2ab3ccd458b4fb79153f0

29892943156370c58c2d8bce4f3f9046001f3442

29902944156457e770c85542cdaefd61733999ca

29912945156c3bd24791cd2d981e93147ace1623

@@ -3096,7 +3050,6 @@

30963050163f05a5bdcc2e5c88aa16e907c0980a

309730511643fbb1a639083bc707616da062fd49

30983052164401c43ca6f0e04f4b5d6b75675bd3

3099−16488988593d30a9b7ed454d913521e9

31003053164b90dc96bfa01e3e62c05ecc957896

31013054164d19eef54fc4ebe43c13dcef481eb9

310230551650c4fd9b6a5ac59b2b08305c0bc477

@@ -3110,7 +3063,6 @@

31103063165b32d5b028d1259951ca9a1b54497b

31113064165fcdb4c6a6832a2294f7c0aef7bc48

311230651663d8d90d70b44d9e30189ed6fe2e44

3113−16667769f0a138209045de056569ab79

31143066166aa5450f896a45ac8af246c3694bea

31153067166b9fb4135668f87b88e7a628d72afd

31163068166cc6b96992f86fbce5b08d3f49c704

@@ -3239,7 +3191,6 @@

32393191174c92c4d8498e94a783c8f2af82cb1a

32403192174e509cb743282aa21a5716f669aca6

32413193175093561bae9ab19a1832ac7a1b9570

3242−17551ca0d9614256f95eaa13c49a11d5

324331941756a11210a20af3e3d0664e7a0d6da6

32443195175a953f1369420bf35b2f1ecf4c95cb

32453196175a9e8c09a4c972122e934d9ed96ec8

@@ -3283,7 +3234,6 @@

3283323417a58ab7b63773abbdab28db45a27244

3284323517a63ce5addd37f85c9a40dc4ccdfabf

3285323617a8d978474fda69b1e4ea99029cefbc

3286−17ab06b6322e5c270663c48ba2b189fd

3287323717ac9c171d92848138b92eab39721394

3288323817adf710d7c0dd712057b2c5cc32227a

3289323917ae1457d0a54bd1ebd74b786bd74581

@@ -3331,7 +3281,6 @@

333132811805599f3644e85eb61f5088cb5bde64

333232821805dbeb723c2e4ba646ab7c51827b86

3333328318080e5fdb9567981f9a500974d1a012

3334−180c9c75b95869f46f4788b0173917cd

33353284180da230860d49513f134adb28fa88de

33363285180dbc03b80475589ac6581181e082bd

33373286180dcfda05a3982f933d7094e5726e6f

@@ -3340,7 +3289,6 @@

33403289180f76be348bb84760a5b0e8b68a4b1e

3341329018106a7102d0891150702c7dff9c5431

3342329118106e6b409230e127b99873f5773461

3343−18128017b2ddf61f47bc959c9e508269

3344329218156fdc4bee4c39bd4b9897a8c52be7

334532931818929d1623769a7cd6282ba078dea5

334632941819764739508b13143f145caec68b54

@@ -3366,7 +3314,6 @@

33663314183af19306f11248d5611c4502819c5f

33673315183b584c4366fbae04e264227db8d57e

33683316183c7038e446c0d8194912eca901952e

3369−1840907695c20322767937deeaeac1c9

33703317184166c21cd997a8bac69a9b787a833c

337133181841b25ac280953702d8577ffcb64d35

337233191843a99fba6a1b10ceec76dd5d16e6f7

@@ -3386,7 +3333,6 @@

33863333185969942425a17cb0b2ecaf46f29dc9

33873334185ebc9f05dc1e452349634ce67bbf0a

33883335185f96bc26dd88494593800856f946fe

3389−18603854eae3fa163a517dba0a4c3cb1

33903336186092b63126e09ba178fa04cb9adfb5

339133371861aacab14559d0918ca809e2dfe677

3392333818654af399631eacea5b75d0de20683b

@@ -3402,7 +3348,6 @@

340233481880c62f9e0fd1713b72c9159a8d9a0a

3403334918816d625e5ca8913ec24bcb2928f983

3404335018858b1108a05c894dc7fbb27c0610dd

3405−1887b8c7cf8d764d00500e07f1ac50b7

34063351188c59a02e4e8ca7408594fecccfd10d

34073352188eac381b1f991dc890164ccea7eb02

34083353188f55a962f00c36990481ac706ae83e

@@ -3421,7 +3366,6 @@

3421336618b03fd564fcbc5e1daeb30864d170ca

3422336718b0ac3f3049ea8351698781d5755895

3423336818b0f492b7aba321fc2c6c9646701675

3424−18b3d41c188642bf5f6fa717c9a6c2cb

3425336918b53e160ac6674a0bf556f10d62b3de

3426337018b5c004fcd043009b98fbf7887321da

3427337118bcf3fcc4052418de7c334c43b17ab3

@@ -3436,7 +3380,6 @@

3436338018c5b1418410fa1211704271fc70ee71

3437338118c5c1ad2cb0ec25154852f0868b4ed8

3438338218c63ad2c9700cd068c2417e80ad9cb0

3439−18c7404ba713d8d68fd3e54b51ad4ebd

3440338318cb8cbd24b6f13cdc235b29aad97921

3441338418cbd58832f45edd02aeb8927ab3a842

3442338518ce1eb58f8c3c8c1082f8bbb5a27f87

@@ -3513,7 +3456,6 @@

35133456194cf236c5fa6c6d71346ba98ef2b797

35143457194e41e4f4f4d64e8a8719c636a0a20e

351534581951a0272b53ae142554fb86dfa66ff0

3516−19549cc2a14e437d48222abacd54d757

351734591954aae4382191b5783956f7cd4cda71

3518346019551600413286933a9dd7e2485d59e7

351934611955b59f64ffa9c32ff702a8638fc0a2

@@ -3581,7 +3523,6 @@

3581352319ca1c62d3a005d5dd4591e7906f329b

3582352419ca46dde9ba5371d98c5548f88905b8

3583352519caf2332c229daf71260d7c41696cc7

3584−19d2d4a44604eb362372dd82f175b530

3585352619d9ba29ab67d5bae320ba050a79f91c

3586352719dbba622257a15b1b6c16a241396acc

3587352819dc1b838e70c81d8f02eca72b1ac0ed

@@ -3612,7 +3553,6 @@

361235531a044a9f10165a4ab603e6d37475f736

361335541a04504397a00be448af862342db6305

361435551a04ad64f5adb8836e69f1753c1e1491

3615−1a087b98be38d22e468030d9174afcbf

361635561a09a986eb810e0bf55a2b4561033121

361735571a0c0c367e4460c92fe1313c535d3f2e

361835581a0d9da72186bdb933ff0bc02d0a3ea2

@@ -3629,7 +3569,6 @@

362935691a297f2fa67c45d4401545471e094993

363035701a29ebc949cac3b8d02519c2d0fc1937

363135711a2cf37cabb44379dccb3f84a4adf420

3632−1a30fb767120f3ab972d960483ebe0b3

363335721a3231b6dfcb5c1bce168c5e98840a1d

363435731a33adbe4d1725536f6d1e3ba35ace83

363535741a35c500e1b805a87c360492b806a52b

@@ -3643,7 +3582,6 @@

364335821a42c1dd9008d676d963463471d047e4

364435831a4336a08a9d5f185f9c13b90960fdeb

364535841a47ab0ac3256b384127af5d0908c34c

3646−1a4b63d6445a32acacae93e24df06425

364735851a4bf95bfe29428fea1708869a40cf8f

364835861a4e0bde9db01bab99f9e2d60cc2b661

364935871a4e2113fd1a1c6271e0f55a9ec5c8f0

@@ -3673,7 +3611,6 @@

367336111a8b47743279550b69b40befce6d7030

367436121a8e142797b1db0fec748f72a2f8b977

367536131a8fd7b48761255c188154f2b6e1be5c

3676−1a9183248a8a7482e4d2f530ff45f641

367736141a93555c8e388c117e10c3c06865c5b7

367836151a93b10736f4156dc4fdcb530600e7b1

367936161a947f1808ecd8ea19c7e1969b9aca18

@@ -3724,7 +3661,6 @@

372436611ae2c3770561dfb0fbd71ad95e06a744

372536621ae4fd14d6c7783fd3399a8eb96b4a5b

372636631ae6d97b6e389d50a48612ec6c5552f0

3727−1ae752f67bcbe8f3ea04e0b5654fe3a5

372836641ae91064c5c9feb1c60959215f718fe5

372936651aebf0dc84306c61c1ca853cd3e5bf4e

373036661aec334259366b484628612bec1e561d

@@ -4003,7 +3939,6 @@

400339391cf633948316db9c050900edbb44ea97

400439401cf6e1a8e5997504b32f5ad49e216d9b

400539411cf72a5afd59ae568f567357a2c86b9d

4006−1cfa750cbc3b139b5cab805ce4f0deeb

400739421cffad53194bd4abfb7e5132e5771b35

400839431cfff3025eb455c9d28875ce4878272e

400939441d03362dee7f9c248d13a60c238d9be2

@@ -4173,8 +4108,6 @@

417341081e2d473d061b25cbacadc8e81b2a737d

417441091e2debbf7325a740ffc65ec5b98058a9

417541101e2f742244245e5871bf0ace38fcfb56

4176−1e31dd6fcba2342d1a8fab6b1b6cf809

4177−1e32ab9f89e19ffb3c7ba2be326def2c

417841111e368b09502a2873202703637faf4589

417941121e3742b2b5b20008e07594c897b991b0

418041131e37fdbc54533cf9caefb4f92d701ba0

@@ -4274,7 +4207,6 @@

427442071f0046b6cd5422acfd33770207d233d7

427542081f03f58d9c5fb2b2bd8aa7967687df26

427642091f049d139efaa17026f6f8904036d6b2

4277−1f060079c0275d6f679a71e32b38eff3

427842101f0cd802a6a3eebc4441d53aff8b794c

427942111f0d66b723edc83d56ebf38444c7c8e6

428042121f1100bf4e86aa6af9dca73aaa190813

@@ -4360,7 +4292,6 @@

436042921fa4d9e192fbb1f457731596d69aa1d4

436142931fa8eca458771e4511bf2790d4cb6c07

436242941faac104ab4f131de20c572e2d02b2c5

4363−1fad6a5e098a087629e0e856d487b8a9

436442951fafe839449f3170c50e74bdd2decf97

436542961fafecbe6340890b1441b90ce823246d

436642971fb00f15838330e31d54c46575fa927d

@@ -4584,7 +4515,6 @@

4584451521287a3dda3971fad56f4cb8ac3ab843

45854516212955c95f5366584176ff1320998748

45864517212f68898a926e495429ae787c5453c8

4587−213306be668d6f53f76f6075776d22a3

45884518213452839e907e0c7241288beb139f60

458945192134e86794d48e03fb7d65da6722a03d

459045202136d97d95fba530a8fb4911a007d5bc

@@ -4600,8 +4530,6 @@

46004530214dee30e7f6cc4b78a40dc82759686d

46014531215378aedc529e3c4af22303e4820821

46024532215623634aa18fbe210143d40f46d7e5

4603−215aec7c704d32ebfdbcbeea31c3429c

4604−2162b518c3e8b0a8058db4f591423221

46054533216581cea881b54ca9411cfa37eac543

4606453421659e8733725d1d857397b30f18ca71

4607453521678afa4d522c95b2272df06daf7af8

@@ -4644,7 +4572,6 @@

4644457221a12ec3d136d01b945fa752d1e20dce

4645457321a24667db6483b7f39c133250eed55f

4646457421a49dbd01826abf1c14a25c2d452922

4647−21a8274289f7a1c2a89746551e69204b

4648457521aaa995601b5430fff898241729a97b

4649457621ab6d5e0748dfc516c080badb186309

4650457721ac935c1e90efe82e29d4713f4258db

@@ -4768,8 +4695,6 @@

476846952268e395bef9d1170245f4f33a026e24

476946962269332a1325b2938133feb36ea57eae

47704697226988a630cc03dd52a2a49337b5b6e7

4771−226bf0be16f85e376ab89de0f877407e

4772−226c126a435482dd1469e1faa8542b11

47734698226dd61c2c190902634d9f7bf65c245c

47744699226ffe618db53256a7b8c0fc34f8a05c

4775470022700379ae5b2ad074f26fbc9dd1fad2

@@ -4822,7 +4747,6 @@

4822474722b796888ca66a235782c3e50ef3f2ea

4823474822b9f4998ff006e4a9db3d06df7f2dcf

4824474922baa8398201f13e019f1853ed79844a

4825−22be43714c91b02db0252c6fec2dc30c

4826475022bec97dc2c9a956320fe329d029ed2c

4827475122c043412e17968cf365926632449f6d

4828475222c093cadfbe1d3694a9d2317e6d320d

@@ -5025,7 +4949,6 @@

50254949242bf4402908111e68ee5d905f24ff6d

502649502431eb57d26e209e308a7ab8b03e726a

502749512433fb0553e870759061fb786bf2a539

5028−24354f493442fc58de2e26cc16d33c3d

502949522436c5893c9a61fa5cdf345e13683f79

5030495324393b61ee2a476a9e6df818bcc1ac3e

50314954243b55026041008fc711d7a85d682005

@@ -5134,7 +5057,6 @@

5134505724f31f613a711b37cdd48a25b231274e

5135505824f35bd3c67b5b2db6236d4bb2721439

5136505924f632d6e088aaab2ac702e1456828a9

5137−24f6da399f10167f1e6fa9369d92c40f

5138506024f916e65f03be6d23d9e0a78bc657aa

5139506124fb5287ecdb049660f92c3b2d547ff9

5140506224fc3aafdae08e01eba590cf1fd9793a

@@ -5155,7 +5077,6 @@

515550772532d339f2535553abee7e8a555214fb

51565078253365494ad8f402bf5537d557d48621

515750792534c7bc69a0851bf34e341c6d74999c

5158−253927a3ecbdde3f452695d139ce0218

51595080253a19855e60b8881d4179d0c94d8750

51605081253a1d66ad90844143dd5e0fb9c26bce

51615082253a525a91ccf1585d4e5c63e7e74a7a

@@ -5265,7 +5186,6 @@

5265518625f67ea6e3eb53a0b3ff6eaf4a7ea342

5266518725f7833461a5550f1167cd66a0fccc4d

5267518825f8be8b380f07fd7c0bb7fd47e4b2e8

5268−25f9217cc916e3b885967daee31b8ca7

5269518925fc114c7c21dca54a0b09ed6f1cd622

5270519025fd6d2aa38e1f9ac959e318d6336d06

527151912601c012ba82f65dd222671165d25595

@@ -5293,7 +5213,6 @@

529352132634a66eeb804768338e773ccce76f4e

5294521426364d9a7cfdf3a55d2cee8d791af0b1

52955215263837da4269c4e9b0d83c10d8d55db8

5296−263ba85e59306fd571712007a75346f6

52975216264001400ec2643cd03cbf138444da04

529852172641fc189a422f187cfd2a6aa19343b2

52995218264456c4c0ba9846f54e044dac221b46

@@ -5428,7 +5347,6 @@

54285347273bc07a65dcd3a2d0576670513371e6

54295348273d8b47e2d57417e706e7989e63a9e8

5430534927411bb34d1c7c0a84f14954340fae54

5431−27449c06d0ab895bee1475a611791667

543253502746e8ca8572542a23edc81127346252

543353512746f2e565e5de8f06272a4b8194a818

543453522748ea5059a311850f97a201ed3ddb3d

@@ -5574,7 +5492,6 @@

55745492285b148ac5f5c66ebda9631dd476fa47

55755493285bded72eeace977ca77c0cf878a437

55765494285c16ccdb48dcf9aae9f766a8434610

5577−285e03b0f5ea523912118b1e70bb6913

55785495285e417317dddece917b2a3690c86d8c

55795496285e7f89c2653bf230bdc02696d0e77f

55805497286047d4fe2783dbc244da5b35a3b5ea

@@ -5614,7 +5531,6 @@

5614553128944ce2047e683d4d7a2d6fc0af0244

561555322897f6a64d1213373105272033ddb983

56165533289824f009550e2c9c03e3221272cc96

5617−2898a02c848cd185bc8276d862ab4b89

56185534289aa06e004fedcd32bd313da295b4b6

56195535289b591ccdb085a5953285590cd31dcb

56205536289f18321d8ba6f54b82d0edcfbcbe6d

@@ -5623,7 +5539,6 @@

5623553928a8529cad3a28c26ec20f9d8acbf2f9

5624554028abbc21728deb8961fd71513984ae65

5625554128ac76f15fcd088d60a5b81e70f2f6ba

5626−28b2afe82205c9a2a2706a10f0906483

5627554228b7314e966befb05355023e12d6462c

5628554328b7736f0d226cc40aa3dca2d1b10cbd

5629554428b9a17827dd56ff2bce79d79fcb1ded

@@ -5728,19 +5643,16 @@

572856432974512f4a86dd69d60577e3587bfe99

57295644297590bebd958de5eb46cb7898a0f4ec

5730564529766efc5a9d8bd7582b88529aa687d1

5731−29789655993975404b0423af495917fe

5732564629797223ba337cc0a19160135531c7c5

57335647297a5cd892836e02e02e75973e63ba0b

57345648297c2cc9c83b182a3425978f43b395a8

57355649297e2e3d25789a03e48f4914dabf1578

573656502981b24a8ed5ccad8e5b77aba148a65f

5737−29826a980808e2a6ac992f6e3ed8a0ce

57385651298333bf0802fdbcff07cece94ff7ad4

573956522984d2d255a5e3a23ebe3755f77b7427

5740565329870d8763c0c19b3a7325a69d873021

574156542988619b9d43c03abb41d1a01bccc800

57425655298ea4504b783283b8e3e53c50b6e7fc

5743−298ffd88851e55cc0b475de1648d204e

574456562990a982f0cf642fefa482c42ef27e95

574556572991949b2a31c16b203a167be1c860fe

574656582992f639ca33b74fa7b1704a8baf4e8c

@@ -5798,7 +5710,6 @@

5798571029f20b2b6e598bcb329bc9056455fffe

5799571129f3d979123e4d496a0c4c46cf21e8dc

5800571229f50143a51769f224e9edb7c601a696

5801−29f71bfa78001c4c1b76cb4a2baa7e0d

5802571329f7f5fccb153f75762d30157d7b2b6e

5803571429fd6639ca9813cd680da5b6a9ed009f

5804571529fea0396096069a878fcab69b5005f4

@@ -5854,7 +5765,6 @@

585457652a58debbaeeca30a29885337a72dd458

585557662a59d1a99d9359790e57347354450f47

585657672a5c7b67d4872369c6da3b0895fc9333

5857−2a5f524da2cd3307f485b3d94706de67

585857682a619d84c777b4f786c7e72e4b0f9179

585957692a6305ac3a1de42a011e7b166257d8c8

586057702a6537113ebcce5bfecdf87172a17b70

@@ -5892,7 +5802,6 @@

589258022aac8d6f8d78a800efa51ec3490847d6

589358032aad92bd5bd3fc88b69da5283ec30d04

589458042ab265789b612b05301904721ca3616b

5895−2ab3b924d87b91a23c168fdcbc9a6740

589658052ab45d0c004fecf600fe653be8f360a0

589758062ab4804b8fbfc49d79ec3204184a7b71

589858072ab491ab71d0a3c7f9420c2cd9cce454

@@ -5937,7 +5846,6 @@

593758462af211b896f11e40fd40afbc52181c64

593858472af25a39e19edf54a4f97b548482b0fc

593958482af95e7e4d3aa60852212eb5d583a4be

5940−2afd4980027d11e42750e5ba7ca3f547

594158492afea65f6046085b40e2b7c3101bb21a

594258502aff5f5053d631642eafcbdb4e3dd6a8

594358512b0239f5ef9afee27dc7f8c63cf559c1

@@ -6003,7 +5911,6 @@

600359112b88507336a9ca4466114668fb891f53

600459122b88ac7996befebabeafe55af1b21516

600559132b89a01c4582d5b5245cb55641cc36bb

6006−2b8d8b8e74f5244fa8783de41b7a1749

600759142b8ebf15afed3d851f5298b60311c77f

600859152b8eeb41c39213c12f9247f21ca078f1

600959162b904936313175bd9d503595e259ecb4

@@ -6143,7 +6050,6 @@

614360502c83cebfde8dfd8ea697cf8ae72ada88

614460512c86880e44117c4bf68e20e95036ef1f

614560522c879d499efc567a8edb6f07c1f0c02c

6146−2c88b9be2f85cf2e3e060954ff819ae7

614760532c8903ed2fe58a658231cbce5d62c20c

614860542c8cad393ce07164bddc60f107576838

614960552c8d3c1fc449f3315e9d36d35daa4b19

@@ -6185,10 +6091,8 @@

618560912cc997cf408b5c0b494cdf3d86241e9a

618660922ccc5113095de4f946b900598a75d13b

618760932ccc625da3e05524d8ac0cd049b8e3f9

6188−2cccfd7ff8fb69a4f33764c40660d52d

618960942ccdcdb65f4802127012b617ded4fd62

619060952cd3487e80f8f54abb96a51be0332809

6191−2cd62046e12872ca3f19cf0c171a173e

619260962cd732100172620a6a04ed5eaab0890a

619360972cdb89c9a6a1bb55a08f32bdf102dd71

619460982cde5616952432b872e37d2080590366

@@ -6260,7 +6164,6 @@

626061642d5aac648425e8ca3c4616db390fb688

626161652d6084a62210662ec4514727e15d3e09

626261662d60e746bb32e362cf1733d8ba5d8d3b

6263−2d62252373677c6347199244caa89bcd

626461672d655e367aa5ff058752ebea0a499956

626561682d67f376ea09f482f50036b99a4a01e7

626661692d6b82ff18ed6f3c0246d15dd0fa4655

@@ -6278,7 +6181,6 @@

627861812d7fb7b0b7f12c9157a31fc2c2a57a7c

627961822d808561c772b205b05ed0b63f4f859c

628061832d81e6af689d2472e807638b4e78222f

6281−2d824cdef741ed2d60a1bbb5e1b2a47a

628261842d8406f55696a3aa49356fc0c6918229

628361852d853ab8e6aaa8e0c0857a82c5e81e1d

628461862d85f842594ae43bfb592cdc87f85fc2

@@ -6600,7 +6502,6 @@

660065022faddb1bbfecefba6f0262bce5043e07

660165032faf4bb58c5dd99179ccf87402a7800a

660265042fb0137e0e4292b071b680df14ba2f41

6603−2fb11b18a422c1d2bfa65b73ea230a05

660465052fb1396f807dccfc1a956086a493c69a

660565062fb17be1c29bfbc1983de49c960a2e70

660665072fb5705a7a569cffd71f955c4fbc9390

@@ -6651,7 +6552,6 @@

665165523001932eefa787f4ecd815fe8a52172c

665265533004c5eb89349a380142629ccd8478b5

665365543005a4c73404e10750ef3b1c8d2626cd

6654−300649194653ada18d01255f317abfcf

665565553006dd57a40dddedc3649f4669aeda39

66566556300b4259321b33a685d0fe2cfdab25f6

66576557300b50cc132194c6c0f0b6e021a5324e

@@ -6667,7 +6567,6 @@

666765673021e3c9a45b98b797f8909f2e4bd15d

6668656830242a916a57fba0c186e2327760b649

6669656930251f9959069cd9ac2f756a73f640cc

6670−30270ad2233aed3f38a6e1b6036f260e

66716570302c5e3f52ea1796ff5c4b4ee473c604

66726571302cb8dced187ee9b257778c8d642aec

66736572303122b30d511b6146151f9ce8dd1f09

@@ -6747,7 +6646,6 @@

6747664630c28c08b133c649a8819a4b43c70501

6748664730c54d8aad47bc9797fe59c8c2512dec

6749664830c6f86305f56c4ab36d3cd1705fb5f7

6750−30c7c15de55a187001cff4945b4dfce4

6751664930cd3a88a4cf921f52382336d9de8eef

6752665030ce367403ecd5840dbe2f1ffae89a27

6753665130cff0fd93ab9b1db965256ca040e2a9

@@ -6777,7 +6675,6 @@

6777667530fdac64aa82107151cd0a46fb8de584

6778667630fde556c5421ef247ccb5784f833690

677966773103884b11c754dd558d3cd5993070e2

6780−310759d678f74df9ef710507750f8b1d

67816678310893f74259659ad834c78d5398f087

67826679310b3ad10ed500e5be6e2c7349c480bf

67836680310d7e9922ccae1da7839f1fd48b26e0

@@ -6826,7 +6723,6 @@

6826672331515a3dc546b0a8fce705f6f0b4f37d

682767243151af28c457f9dc33e618e2c371f991

6828672531558a2f8bc976d2618f0bd5c96b46c7

6829−3157b33f5f72f8380afe8833f0c63b5c

683067263157b68fd0e9a50481a9ef1451a86526

683167273157dc736dfc5361029f67b6c144e30b

68326728315afc8b3cce5749ab1d72ec3270f761

@@ -6874,7 +6770,6 @@

6874677031a7ae2f3b29cbfca442ffef4ed681c9

6875677131a9f40046ec980081eef67583f44b85

6876677231aa58c1f0c5adb3e9e2a28b7ae1a77e

6877−31ac3e45cb41678a47d64c54d7900813

6878677331ac6f448e01ef25d8b79161c42b7d1a

6879677431afa2c778113995c775893005e989e2

6880677531b05c1a598a97b4bcd62b535741ba6e

@@ -6978,7 +6873,6 @@

6978687332563766ed07f305221ff3e59dc23cb0

697968743256bfc839f1964541fc4efdaa5bd3ad

698068753258b3a03136974c68261caa407bb2f8

6981−32593c50cbdc319f30eb0791b7e9f19c

69826876325987ac81737ff165c5b8efa460c6cc

69836877325a857b8b7d2de316a61ca5b56ca585

69846878325e03478bde90548687155468e45869

@@ -7160,7 +7054,6 @@

7160705433ba312306f0e2f7440857459a7fba44

7161705533ba588e0ee353c74d3daed1d31d402a

7162705633be7e2cc276948d9dc19e88bc8fafa5

7163−33bfe5edfcbd6871650cae3c8e91004a

7164705733c07caecdac9d80cac5b60669a34053

7165705833c4453fdb220e70eebfc0522e825ded

7166705933c8ee82a06de02be208af2591608394

@@ -7177,7 +7070,6 @@

7177707033d744b9d0b31b63468e11e2678235b0

7178707133d81e10e3c786f80a6b9efd7732e026

7179707233d9e797cda39e5439e01a5f7ba6a6dd

7180−33da3b6e840adda6d8edfd771edf3d53

7181707333da795134e303e65f253c90ab8c6077

7182707433dc0200fbd64a13c21fac2b6dc787ff

7183707533dc0ac7f76d87d702321b48f24c74ee

@@ -7231,7 +7123,6 @@

723171233439b9d5b235fb6effa861de46789935

72327124343c520361903f4ba4b29fd0339769bd

72337125343cf6d64d66efcb58e8b8d13efde47a

7234−343df1de866e832a86ff3de65f8b4b06

72357126344132abc716ccb3ad96b1a8f9a49078

723671273442f8577f4e65a15d3ef32192620ed8

7237712834442ef4a4461ef9443c24e12b9a00ac

@@ -7251,8 +7142,6 @@

72517142345d2208636c9123d13b43d321f65c56

72527143345f2be55a7ca13739b97e8b941287c7

7253714434604f1518f24740d8a8eb86ca2b6f9c

7254−3466347dbe7d28aee259e216a8eecd4d

7255−346818e4ac465671b29506d7a7549fe9

7256714534698005315685081d59745abd592a51

72577146346b8b348c6e8878ea8aaba58cbecc97

72587147346cc320ad855b4a6e78062810c0e9fc

@@ -7277,7 +7166,6 @@

72777166349d53a52fac283c213a46b1d3a1a7fd

72787167349d6215c9ff95a961e8ae6455bccd55

7279716834a094deff5bb18f10793fece596eb0d

7280−34a59e66de747a74f5923c1a9a132c27

7281716934a71ff634ea0327c375f0cb0a020dd5

7282717034a7278efb4a488d19549b6a3452c075

7283717134ac137d39f2d3c4f1aacd9942814508

@@ -7350,9 +7238,7 @@

73507238351863e88351b91ffaf9d6cfaa1d5b89

73517239351da229e46656801ade3868ab68033e

73527240351e2efc0863f8bd430425c80ab97286

7353−351ff1520666cafcfad55543a3dddb10

7354724135262d96680866967722a810dff20941

7355−352719b67f6fb944c3de565c13cb7ae4

73567242352b646633b78805162ad783a6d7d403

735772433531e183e4f880842762edcc2b649f59

7358724435332e0307dad58bad0650270f458671

@@ -7414,7 +7300,6 @@

7414730035966765929789cb2b737f85550735d2

741573013596d8cbb6383688d394e225f01db680

74167302359802288e0eb5a906f22fa283d66c31

7417−359e97b8ea9ec5fc427af5b0d2e28c75

7418730335a399f6528fc280d3ab7423365a14eb

7419730435a50e7b3c35ceeaa432394862dbffa5

7420730535a6db5f924f9578edb20721729c88da

@@ -7512,9 +7397,7 @@

75127397365b61584d9d77dcbf95d2b4b41db6f1

75137398365c89cd8624b9483e2bce59fc7a31ed

75147399365d58e60cb52be513b10c4adf0bee87

7515−365e5864d7aad8f03310d5fa053b551d

75167400365f157e4aa5354e10b1b4fee0d3effe

7517−36611e6eb7cb764af2ccf7b2ff873910

751874013662045b2ad79b7d42da2026e8f30bf4

751974023664268ffbbf27ea844c6b67d9777bf4

75207403366436ad1c512681f3ea02535411955c

@@ -7577,7 +7460,6 @@

7577746036dd6e94818c316ff0e4230c6a7a35b5

7578746136e0a354eef5a98baac58f3d0194dfdb

7579746236e31d8ec0cf3b1c0827b44ed200f76f

7580−36e44838e5528980c594b36ab8182156

7581746336e4de122f8e2ff30105f0c65648a52f

7582746436e7cb473444dfe65619f45694341293

7583746536ea8c610df7b5ad550b1772e9c0a73f

@@ -7699,7 +7581,6 @@

7699758137cde8321b0b09adb056b9b174e8c3b6

7700758237ce9de96e85700e3a2ef9048b19fa1a

7701758337ced5ae39492dc5b6ab467e6498055f

7702−37cf55cb6ee015613d9212fdd0f238e3

7703758437d03f7f5a83e21f819d7f423da43f70

7704758537d29d64da02cd3a68ba1db46eba0a0b

7705758637d32057469f849e99c6c00a1999587c

@@ -7824,14 +7705,12 @@

7824770538ad99be123c02d3b8742c9a1fa5f6c2

7825770638adeba05c1d947b0b1ddf67566630dd

7826770738ae23dcf1f3bb044c03e0b26d420a67

7827−38af6cf167feac9e7de86d187e6ae04e

7828770838b098c2039e285728f50087156ab78d

7829770938b1bb9fce45c2e2ba62c50b08385a3d

7830771038b1ddd70edb991ca1cf962228ce8e39

7831771138b27d84f38c7087ec56afe8228774d0

7832771238b2fb181fa626e3721446c8af80f4b7

7833771338b3885a733062966147f8e7e7234ed0

7834−38b50ddb06b770b568d29d37b554e798

7835771438b9005a721bcc3816954f506b1ba273

7836771538b93b08f69477e98c2eed1444ce435c

7837771638b9db80c1c948cd1cef93331d6f56f1

@@ -8029,7 +7908,6 @@

802979083a27bf17e85342a7133da5e8ee042e4d

803079093a2a28171d1af1d24eb31e46b3106d73

803179103a2f047e790de8f536864d4f10152b24

8032−3a2f0d6418f2e4e6c20f1b2d19eb1ed9

803379113a3084a9dc688ccc919b36694533e1b2

803479123a31425c4afbc90ea28f9fe971b84ecb

803579133a31a6ee30d322f75496d81698567eab

@@ -8064,7 +7942,6 @@

806479423a73dc9f458b9994355d79b275fdff6c

806579433a73ec18a174bac2a1d580ea86ccd6e7

806679443a78a5125cee5cba31500ae5ac3566e8

8067−3a790bc8fc99ff9f1b8db831b20a84e6

806879453a7e77c29949062a778665e75d821f3f

806979463a80f4e044a01c70b0bc4e6027a6975f

807079473a8346fa0f3d6c5d2a890a4d8e12be09

@@ -8102,7 +7979,6 @@

810279793abd9069a548fe930d80c241d0db2e58

810379803abf727f6a140e9fbd0d93e4bd9141f6

810479813ac1de1233080588dbd0b515ebb547e3

8105−3ac4e8646ef0385d31dacef549c54050

810679823ac52710c55999bb0958d054792919a7

810779833ac667af4b31c6580f390d02404d5e57

810879843ac91a8cfaa9047d04845b167c87b04b

@@ -8169,7 +8045,6 @@

816980453b393672fd00026d1caef171c8e575c3

817080463b3a38d4a683aa9e0292aff1609bb26a

817180473b3d06c6060ccd370a0ed8edbfd025f4

8172−3b43c8f4c97188bcdebdc7953c021e0e

817380483b47db796b8d1ed64610fe7c919d57f7

817480493b4863a3af62b57aeee0ef91e052e41e

817580503b489d1d8d85f7aaee9a5259d2d57af3

@@ -8199,7 +8074,6 @@

819980743b8dba4b8bd0cc6a155187959b9f9917

820080753b8f9728a76fd52599aa6799af1dcf96

820180763b905a970cbe626caf135bca4fcef131

8202−3b92b8d0d597ee47622c1ea61a787fb6

820380773b92eee6edebfdc56483d87d98c465e5

820480783b946cd74121cc34a9c0b3c2f8ed4251

820580793b96abf0fcb55c771453e00d38000d12

@@ -8245,7 +8119,6 @@

824581193bcda9752cf77c2341105215eee48d4f

824681203bd016a11100db8a4928ade809a1e56f

824781213bd4778c7b81b92271a8de5eca1dd7b6

8248−3bd4fb3afa03383df338a1d7796a7ae5

824981223bd52ed6915295790c0401bb95f7dd41

825081233bd6ca9ae6bdd9c4578c7530109d7b6c

825181243bd7eefe0a96e242e42a2f2637c02e85

@@ -8316,7 +8189,6 @@

831681893c407cd5d8383d8f78d285424872e75a

831781903c40a4126da908ff82b8398fdb7826b5

831881913c410aafe6a2a08faaa388810dda0f65

8319−3c44229d9b1f99a8cf9e2a1ef775d50d

832081923c44a80e992c79802741a886a9d34d07

832181933c459f47452968a1d4058050a007d94d

832281943c4753a919e7d091343e4d49b131b1e7

@@ -8337,7 +8209,6 @@

833782093c63398d8e2809a61f6c78b736964f49

833882103c645d9d08e4ab7e9dc2f61cb658884a

833982113c66a9dcfdebed9469bfc22ba2000228

8340−3c6a894a73e5561d53e97ad33d1a40f2

834182123c6c441bc6092df71e6cf4b147a43661

834282133c6cdc2609d1a30f67f0d132fb0ef69f

834382143c6f77de8570f80f5e56f16666b05340

@@ -8420,7 +8291,6 @@

842082913cf4a6c9027cd027d6f05675235c9864

842182923cf57f562f2d63808b983b9cb8f441b4

842282933cf653df8e4fcbc2609ff610feed467a

8423−3cf7f85fc7932876af46649d02e6041b

842482943cfddfd6feee50a9db8974354c92a981

842582953d00e670d35898f37365a5d7d0a8f3e0

842682963d03575dd2a9df47b64996425dddf422

@@ -8538,7 +8408,6 @@

853884083e0449d4ecba8f08c1181abe85ef31b3

853984093e0661eaa42caed02203d7efc8f51ac1

854084103e096a04d58f48729a36cf90164c60b9

8541−3e0b3c27136438192e190e0260fb7dd8

854284113e13b7e5515e5b7dac5a637a44e5f0f1

854384123e144846ebcd905bc28a6f1df46c7d51

854484133e16986abaf0ec6cbfe7276a82327668

@@ -8626,7 +8495,6 @@

862684953eb58b28537f15ccfa7a4950869aa210

862784963eb768776f5d7b0f08bfd2b1d67b3f7d

862884973eb7cf74f371b87a5ba5f019c89e71ca

8629−3eb83a31305eb11966d8f9424fd33beb

863084983eb996c364e2f02fc3b02acccaf48654

863184993ebf274d825d273cffac4d8e2470da10

863285003ec0af76f81d9833e8b619df98721d99

@@ -8716,7 +8584,6 @@

871685843f4d019d9b5336585ce811e6ee1add12

871785853f4dd722b7fca4705fbe18c517c87d1c

871885863f4f823db877508d4bccb1af55d87503

8719−3f506f96b7c775dd21a289dc2e5a2468

872085873f527028088e0f42ca97e13b0e1a7332

872185883f57621afe706440c8ae50f9e7efd5f7

872285893f60460f508d4144db5837a919264521

@@ -8829,7 +8696,6 @@

88298696402af7d5286137b9808eadd561326116

88308697402b61835ba8ab20423e00d454cceee5

88318698402f5ebbfbf10caebb07b86baf175a03

8832−40300bdda75103a7053c3cad84d0d094

8833869940316774044047317de2fe43276f1a4a

88348700403459402a1d190b58cac86e5e8d7c1a

88358701403603c30f8caa5759ff75ab6dfa08b5

@@ -8882,7 +8748,6 @@

88828748407fce46cc2d26e8c02158dd51f45d25

888387494080dd3ff8719d3b6dc18e899cd59eb8

8884875040848201168e32e05b9ae7ce56692a45

8885−4085e1b3e76ce3a4157f32ef256167e3

8886875140883682171e1d81aa5bb66b794548e5

888787524088edc46187219368a685c6e3cd3103

88888753408a376a00135bc714032ccb9506dc2e

@@ -8960,7 +8825,6 @@

8960882541064f90416c4896489d911f3222f73f

896188264108dda267c497d29de2f3a46c266e82

89628827410a51df65d48f2329322da2e215e1fe

8963−410dbc60c0bd6a4a9141f194983fd52b

89648828410e2bfabd0675e88a6b03acb04b5326

896588294111678fb1cb84b979119d0fc8a2669f

896688304112c57bf460e2410192fe358d81e67d

@@ -9087,7 +8951,6 @@

9087895142018da1bfb5054cd6cf1027adc46124

90888952420354c617ba6a59fc64c0b340bf337c

9089895342042ff4d73237771cf05a81b590721e

9090−4204ec473840d4751e452f129abb24b6

909189544205e410995898e524e7b79bf1da4983

909289554206e8107dff32ab153335877c6176c9

90938956420a5e412a047427a4a947670cee7bdc

@@ -9109,7 +8972,6 @@

910989724223691d860b3cd478e86bdd8e679012

911089734224e1f7cdede3b4d0cc83cc63da4c3b

91118974422555ce8189220b02fe1bcf1719edd7

9112−42266cbb29168b6f3b60b96a2b70c41a

911389754227ceccecb91a82e67c59df7df59f14

91148976422821d8d2ad6ffc1a387259ad3aacbe

911589774228ad1f0d19d1ed2f5dd22604aec26f

@@ -9337,7 +9199,6 @@

9337919943c3808a1c96f07c94daa14d5832f858

9338920043c3a898f8be2d3079916bdac660d5a7

9339920143c3ca858f9f35ea701c88ab1e03998b

9340−43c3cb5cd64da06adf27886b4d5d0a04

9341920243c49b03ce3dabbc004bdab35c5810a7

9342920343c4bb45838e56fc48f1fe1d5e9f719f

9343920443c67d7098b7c0c172363d8efc598ca9

@@ -9375,7 +9236,6 @@

93759236440c917d2bd17fada341ab09771286a4

93769237440e465410205695776dabe27ea2f74d

93779238440ed9cff2a5a18bc36479465e172b44

9378−440f40c4fc6f6013a799f8d8d0ce5053

93799239441204002d5b67030ab89cbdb2fbb898

938092404413510ffc9d96b21f748ac82cd74d23

9381924144135a0ee35d6bc613e4f5b293aa9ede

@@ -9408,7 +9268,6 @@

940892684444e1cd1439170be9f59e808f366387

94099269444845b21866042c5ef6028e5225750a

94109270444a927884777a8b39d441fe3c89b8f2

9411−444daf575c25615cf5adb9eac5cb9950

94129271444fe0202e5698467228fe332e11aed2

941392724450e51a64adb6b6b20562744874a370

9414927344574bf104cd206dde9a39a527425974

@@ -9421,7 +9280,6 @@

9421928044610fa000a8419f62c7af19b8054830

942292814463576db582b91bfcfd798c37646b3e

9423928244638cabaeb0ff2dd03b3e596e0df515

9424−4464254aa50708f31386fd639c81f1b4

942592834469084ed10c817a215c6521f06d34fe

94269284446ad7900eb8c58b1aeae50d0a8b51f1

94279285446c26767b10dc9e510662bbf217801f

@@ -9476,16 +9334,13 @@

9476933444cf390b70b376ff8c3dfba6c40f558a

9477933544cf50fdd8a06f4e5381ba0d7c324793

9478933644d0cd9ce7413eb3a1472e94014cbd82

9479−44d177514560dcf6ed37c67db9d85cad

9480933744d25c626e92c0ce998c134d30367ca9

9481933844d4232b99207587ecb426993407ed1f

9482933944d4f0f6808a22ad71275890fa0b4838

9483934044d65013c96e605af4f986f3ffab5d38

9484934144db457435cd0c8a95ec022bed430d0a

9485−44e0100588a048769208803229c67354

9486934244e044a5820c3d29ab5be5c13ecfe943

9487934344e5bf503c43d1c1b2c0f849e62ca521

9488−44e9a43565593e4e73869a5d43f9c606

9489934444eb4e53cded2adbf129967ddc569538

9490934544eb5476928c0aa716b0727375e98086

9491934644ec00115933efd9c66b18b57e486262

@@ -9494,10 +9349,8 @@

9494934944ef03f54a60366f14e50c32617f3cf0

9495935044f2acfb09ecdb6c44971398c0cee70c

9496935144f335d4b815f06c86811be7ad241333

9497−44f3d49cb46188360ede2c926831a9c6

9498935244f3ddc04b39e4e9d365b1c753b4747a

9499935344f5397671eddbbdc626cb99bf9de924

9500−44f8617073f5a0bb44dade9677eae4dc

9501935444fa568781df1d125120ecec9224eabb

9502935544fa60c30f3240e6be272fcfac574a30

9503935644fad5229781ea15f7a97e5d9896d77c

@@ -9515,7 +9368,6 @@

95159368450d1f5343489b9dcbe9dbf6d45cea34

951693694510601d673ff508535219115c57e071

95179370451181f39cdc91708566fe4073b7f174

9518−451216c650d384a96b7617749ec08b6e

9519937145172f36b0e4a0333f7a8b53fd600e2e

9520937245179d9f9d2568d614aa317459db6dee

952193734518aff2908d63acb7b75a0616f3f0f5

@@ -9546,7 +9398,6 @@

95469398454be8cdc27968096eee0e7f90acffcc

95479399454ce30a8392666e072e9dda5ce7db17

95489400454e74777761111b10d605bf77d91d4c

9549−4550e62e0258660cbafa88eaec12fefb

955094014551130561cc77e416f086c4688eec31

955194024557e835d62267fc8f037ae5079f4650

955294034558c641343fe2127f6a9bafd1e6e156

@@ -9558,7 +9409,6 @@

955894094563ff689b0b986846c4fc79bbef7dea

9559941045677e37346d859c18e61f024497fd4f

956094114567bd9a2388ce4e274922b547597a28

9561−4569b45bb9295f3810bd0b00daa0bea0

95629412456b28e609d2f3f127887bc2e55e5692

95639413456f11823d95b967c25c9af33c2c4968

9564941445713d40feebf7e487c5007ce529f156

@@ -9675,7 +9525,6 @@

96759525464948eff059a094c27cf540e6afe526

96769526464ab430aa003cb46cd22902cbdb2f2f

96779527464bb77f33ff7e1a38e7ee1f0a8269c9

9678−464d13695e6d540f32ed54cee2bbecb1

96799528464e69973404f7c123efe3956b46a8ac

96809529464fe9cee3b77c84519ac4b8c1650aab

96819530465129cf6b1de2f3c681504c90f10721

@@ -9714,7 +9563,6 @@

97149563468c2ee2f11e29bdec9f1f6ee09de1de

97159564468c6b41d5706d0934bb4af48225890d

97169565468e729086d947d3c81647c064720a09

9717−468ea3412ed89e434a929293d4f1eade

97189566468ec3a5fa92d7b373076122fa1b7abc

97199567468f62df06db6d227a7928994a752444

97209568468fae7ceb6c9f3b44bcd908c52cd06e

@@ -9792,7 +9640,6 @@

979296404719c6897161adaf112cdcc5d21b69ac

97939641471a0562ae4fda1174921273aec5fcf3

97949642471b52494fcf020f42f5c7bee7c2a9f9

9795−471d5623034d60487a3980a676c1e02c

97969643471e1087358b5aee93736c3a4521d682

97979644472229e6288a08cdfe861b166a3e9d94

979896454729e6616dfe0db8113202337628daa6

@@ -9828,7 +9675,6 @@

98289675475ca0f147f65ccf9f4f1d6a311e5beb

98299676475d921ff6eb9d0795a2a87ee06ee720

98309677475d94075a513bb0a25256b48334ca87

9831−475ed87f627026c0e40da3fea32d7169

98329678475f3e17a11d8ca1b4212802eb665cb7

98339679475fcd63b1ef20c79b2cd5ded67b37fa

983496804760e0349237ab1566b2ccaf1cb41cfa

@@ -10009,9 +9855,7 @@

1000998554876a4c1483ad3a5f6c876d56082213e

100109856487812b8d6587351d270b776cb8db108

1001198574878478b9a9ffc6ca2d20a583aafd850

10012−487af350a3f94efdbd53e049ca2331eb

100139858487c8cb44f801c091c7863119e49b9ec

10014−487d29a015e37acf6bbcecb45792187f

100159859487eb10308a207eff26d12ac554398a1

100169860487f2ab3caa1201d07d34381719e6b9c

1001798614880c91c0b2c010acb527fe72f06ba81

@@ -10038,7 +9882,6 @@

1003898824898d5a2cb226176c86bcde91928b489

100399883489d8f72be3bc48935b79ca2497636ba

10040988448a14f2b4eaca93355233c58a171651f

10041−48a3306d96a427cc67a7951be7e962ee

10042988548a49febec488f4cdea8fe850be7d4d7

10043988648a8dca670bf9ffda2dad7abd29ca201

10044988748a985037b9870335d2e31d1b5649443

@@ -10054,7 +9897,6 @@

10054989748b299db5a7866ace5f450017fcd8d32

10055989848b3603400e4e58638ea46897cc5fb93

10056989948b3a3c94411a0b8fb91f36b63f24720

10057−48b51e939a643ff13e2db3928d1a28cc

10058990048b7dcd1cc5d7050843e668105cce111

10059990148b9933597dc8a007c46027b7c998604

10060990248bc551873f8272167e299041a7b3460

@@ -10087,7 +9929,6 @@

10087992948e0a23a0c744b40e81e696a9265f6d5

10088993048e3c5b42315c6c319a16b1d59da4d7a

10089993148e5909d423170d23fe07cadffe69638

10090−48e67e2504eb27d7b63a74656d91c4e9

10091993248e7657aa76ba5783c2ee3c962af9c5e

10092993348ea1d9e1d4ba19d4e497125450e3b75

10093993448eb54aebe304885f83e69359100132c

@@ -10147,7 +9988,6 @@

101479988495e1323f3d9d01d96f40f9fb6852ab3

101489989495e5e822712a4c7461be7cfafa72409

101499990495e733742a32bb34a87972af139f4f6

10150−495ed26870ecdfa96ead1aab0ffaeb7d

10151999149604d62d0156bb291560423c540b8aa

101529992496241816c686f1ba89992d76e4fc20c

1015399934965a2feb86ffa7128d82aaf97646597

@@ -10315,7 +10155,6 @@

10315101554a91174f04bd407a69d79995b155e4a7

10316101564a91eeda9d3798360cee46df6a3902f2

10317101574a99aa7495b8c641ccc1513404c2819f

10318−4a9bf8eb3bb68163c3015414a6b21b3a

10319101584a9d77a4c039b1eb0359772c6da59022

10320101594a9d77f1c1227b7d231dd2cf3819ad38

10321101604a9ebaf200dd40a563b81309304e989f

@@ -10391,16 +10230,13 @@

10391102304b0ff12412c983416596dff191b20a44

10392102314b1045ed7a4d0b03d4b08596d66aa228

10393102324b12290d14c112841d6518defd153995

10394−4b14582a1f6dec4ac546070b786b6489

10395102334b1486b466f1052b9e0c346e573fae63

10396102344b1542804d209e432d3fe9dae7c21518

10397−4b16eb1e4f3d43db1f83c5cd49887546

10398102354b183a4d59d92871d144fa232da2e134

10399102364b18d0c2212de60d91e9aea3b7db12c4

10400102374b1e09861757e894a3b9073b3a8820c1

10401102384b1e1ee607b3da4749b93218a4c4763a

10402102394b20b031d4adbb9a9199339013fc5db7

10403−4b22a1f7c35cb1e295e6f3199c875608

10404102404b22acadc20da8a37ca49668d161a147

10405102414b27f013d1404f1c11f0c1647bbb1979

10406102424b28a8dfa9d96dcab1954732fb8c0221

@@ -10582,7 +10418,6 @@

10582104184c671c616e156001bc0c9b29c181b2ac

10583104194c6d28a2ff5e474e78e309ac5c852051

10584104204c716d1ca1c3e8af085a627e5f8b9a2c

10585−4c73af02fcb5688e0280780363dee85f

10586104214c7574bd6149ae5df29f15c3403ce2ad

10587104224c7624709bb2ee45ea657939300bbd81

10588104234c7d63833799fe6df5e7883fa2e1362c

@@ -10682,7 +10517,6 @@

10682105174d37c0e6fbbb0d5b5acc1d8c5fae8341

10683105184d3845b3f9afd9a8dd93cb776fedeb32

10684105194d3cdbcc57698524bd2fbc945b41d6f2

10685−4d3ead26c008263d640c1e811f8c678a

10686105204d400997728d4ce237247560088ffbcc

10687105214d400a1480a62fbde8fec434bf4dd8e8

10688105224d411d0e1daafbc50cb470cb9809610c

@@ -10714,7 +10548,6 @@

10714105484d72b8dcf98cb15e221142264b80afd1

10715105494d733611301749e6ddf2c85356675a9a

10716105504d7661527fbd40d156f07cdfbc72bec1

10717−4d77df19a3597da8f60c52905be30cac

10718105514d7a35462f946235e96c8836629c51ba

10719105524d7aa570b3272f1a4d672ff0eee67420

10720105534d7b199468a09b7500cee06565e8c80f

@@ -10723,7 +10556,6 @@

10723105564d8426a8e3b81818fc6d452e2d11ae4a

10724105574d85d451d8560b2df535b7371aa1d4a9

10725105584d89da8611064e4b8f120ee51a03ec39

10726−4d8d8b8a6413f78bfaf740524e31e95e

10727105594d8e13c4edaced86ad508787254f4ec0

10728105604d8e8c5d8b0dc5c64af4a008430e11e4

10729105614d8f973b37ce704f9d024d444ac27863

@@ -10756,14 +10588,12 @@

10756105884db58b03a10f3e9e7e2978c0ce21474a

10757105894db5d748d7b9a27f9fa364f2485ed49a

10758105904db64909fca43b4ee3163732b67f24f7

10759−4db7650bef330987b9f7fe54fb546770

10760105914dbb9828d7c80916d98e97e26794550d

10761105924dbb9d02f8881d30d7a4660ef3ff4608

10762105934dbd8a8009a7ecbc0667d541aa536e63

10763105944dc0445a322a47708b1609c3b24ae421

10764105954dc04fdc26e7df10670d21fa7c80270e

10765105964dc099d7fd49ccc6ba633f816fd8c967

10766−4dc21ca96fdea28e80acf3f2eb434fc0

10767105974dc2d61cc71e3e10b7a1e176987f8415

10768105984dc31d98c88aa438dd024d7c42ef05c6

10769105994dc3295dd36e7f057538013dcc2f0fc3

@@ -10774,7 +10604,6 @@

10774106044dd023c313784e4e66454390f97cbb68

10775106054dd0f5ae02e94be8e54f4489c58f8732

10776106064dd1948411af64a4189ea96c823f88cc

10777−4dd23c4ef0a0e6108d9fee3bad995f13

10778106074dd23e0c16e46a71d004f5e82c4d54c4

10779106084dd34f5e41e99bbde744693f87c731f8

10780106094dd5b9eabac961a5ef057a8d1fa53ef0

@@ -10840,14 +10669,12 @@

10840106694e4991bb09c2f268b08efc328a643b36

10841106704e4bd8fa220b49ffdf828c17d5fe4911

10842106714e4de82b1e3494a9de7d8a169646175a

10843−4e521568816af8440b220737e53b868c

10844106724e532ebcbede333d9593c9e8fb39d533

10845106734e543d7dd154046c833ee0f59e00366d

10846106744e5617c667036e976398bf9f1d04642e

10847106754e57c5cb658baa7465212b72bf596bf9

10848106764e5e1cccd382826050f8106f63b41d47

10849106774e63a617105b72b89b1724f91cc1c9e0

10850−4e6591664f87f7560d6440dc6b07ea0a

10851106784e65c054a86cb5aeb169e00133d30815

10852106794e691082ccb87596eef14cb9412258cd

10853106804e694cb858a9f6c1103f3a75c540b62e

@@ -10921,7 +10748,6 @@

10921107484ed7760b17f6c3cd0fbdc59ebd91a0b4

10922107494ed866f55b071b51d3be537320ea643d

10923107504ed8b6513d4563e5d7e652a813bea5b0

10924−4edbcfa6d6d123f9627f01b2c3670b71

10925107514edccd105914873d36705b242a553e5c

10926107524edcd6a77ac222551d11d9bdec297734

10927107534edda37453113b1b3e2c8314461eef0f

@@ -11007,7 +10833,6 @@

11007108334f5abe53c16b09896daab13ae221ebe0

11008108344f5aece007e1c4719f1a48e9cf26a166

11009108354f5bdf578e059ef6f30bdb772d022680

11010−4f5c5585419a9fb14bc0ea77d16587a4

11011108364f5cafcf7ffb057b9382d4c8dd17d281

11012108374f5d0978dbaec80477f46405b260150f

11013108384f604c2b3b15e4815c6dd60d51705fec

@@ -11022,7 +10847,6 @@

11022108474f6d1f13ed47ba986e5b63f2645d31ce

11023108484f6e5faf600cbc11c28f7c139d6943a4

11024108494f6f53fd02a978db9432c3ee73842543

11025−4f71a0450c91a800340ab58e2dcaa8b2

11026108504f7476ec7fc7e81a18be156c556e7058

11027108514f76f76c7340b2437831bab6457a60ea

11028108524f7839e45a1f67150cf314e972e1d5c6

@@ -11409,7 +11233,6 @@

1140911233526a4df188a0b75f070fa0f0d310a44c

1141011234526a871713ff39f4c055487d0ab1336b

1141111235526c7a69b160b1b0f5591b270d4159a4

11412−526e7804e6ba4af67a6b20b26b1b85ef

11413112365270a059e8e476ff45da6479b516c914

114141123752754339e1a157a8eff0ee2c0a99f6f2

11415112385277156589f74e94bb8859b3d84aa552

@@ -11549,7 +11372,6 @@

11549113725360aa15856ef3f1cce9be8d26f3af99

1155011373536374159acaf11a4a8803e7dad5c9b9

1155111374536391461493eccd17ceebaa079f5948

11552−5366f42afc3a5e6cc1dcd853027c6883

115531137553672bdad82e52c8cc15f374a995e386

115541137653685d7743faf1418620bdc0e2f2a5b4

1155511377536870b7582a74f876bc6282da0a1765

@@ -11638,7 +11460,6 @@

1163811460540cffe58619a93f753bf65363808109

11639114615410a8fc06eee62d37b79109bb821a14

116401146254129ba4a991bab79463c211db2bcdcd

11641−5417299457c4193733f4ea34326354a2

11642114635419d043b9b8dd8ce42b69f571579218

1164311464541a2629bd428bf540170673d190ad25

1164411465541a57180662e79556d5c7fa4b53aa4f

@@ -11663,7 +11484,6 @@

116631148454386dc3c0cef34a60631fb40e67a4cc

1166411485543970e9dac4ba6fe9fe743f6d6b7e47

1166511486543a1d7c67b03524b47034a2e2ea9958

11666−543a871c76d5feff2f61841352f48954

1166711487543abc852feed5f00c78bc06a95cf543

1166811488543b73f97cc9a1ba299fae06761fec2d

1166911489543b8e48c18a4c4b0bc04941de92467e

@@ -11706,7 +11526,6 @@

117061152654811f084f552d2e5a4348ee60ec3669

11707115275481bd7549d821ec69cbb96b080a052d

117081152854842286a49aba78a57bd67ac97307b5

11709−548495d42b159cacf19184b304e7591a

117101152954849c89fde9e179dd41a5fcca26afe0

11711115305484cf4c2514f58775a89cca1b99e8a6

1171211531548540ebdd0deab6ce3023a19c7a451e

@@ -11764,7 +11583,6 @@

117641158354ea403c70c882d2fe9725e2b12dd22e

117651158454ebd212ff26f3dd50e8567d94c5d687

117661158554ebe1922790a5e74af9a317655f9227

11767−54ec53d4c5a3ac1a7fb08fba242e6c01

117681158654ecbb32f20b78e0d78aa0dbf401b0ad

117691158754ef3ef3b3cf31e027e8cc2fbf597391

117701158854f02f3370f5a56bb05972c09f91aabb

@@ -11925,7 +11743,6 @@

1192511743560da424a58920d930e96af8b2197b68

119261174456107422ec37d823f28453971a51eba1

119271174556120b114dbb8a52a234e1040b0761eb

11928−5616d0de82f76721c9f482cf009fba5b

1192911746561dc1abc10d0fb7eadefb34fe5df995

1193011747561fae812fc4e38819f32b41eea4053c

119311174856207c5c25b34ef673ff37c94d4fa3a1

@@ -12011,7 +11828,6 @@

120111182856ad05df55603bd474bb18a9563dfe20

120121182956ad333a506d4bc941df7dfcee8531cb

120131183056ad4eb8db1e1cb7d44b083ad6b8be27

12014−56b1e66217f5480a74be912ca64a75d9

120151183156b36d49642d47c280fc6fe054fcc1c5

120161183256b4b4327aa8f6922a0242dd04f54316

120171183356b4e124304264bd80263a8f6cfbedcd

@@ -12071,8 +11887,6 @@

1207111887570e3c3a363bbb6f116b4591b120cd83

12072118885713b037ffd4a685778cbdd88bff886c

12073118895713f94dc6201bca0f552bd2c167001b

12074−57180e688bb7f9f118be3a5eaf15170c

12075−571b5ddae3245be083035a6524eab6a6

1207611890571b61b7cfcb8a12916ce6306981df30

1207711891571bb120ff3a6f7585143718d78bbe69

1207811892571d940c8cc7db26fe833d2d9511eddb

@@ -12080,7 +11894,6 @@

1208011894571e0b9ff37a7d698d095708abf80b9b

1208111895571eda32c9d1fdee1fab4661f5a3e7ba

12082118965720d25b130b56f849c2c74886eb87c6

12083−57212b91118be36ed7a5f0a795a27dd0

12084118975722396e37c11dcdf054bca5e3edcbf1

120851189857251900fd828915743b5dff6b15bf59

12086118995727b5ebb1ed3e37d77f77093887d43e

@@ -12108,7 +11921,6 @@

1210811921574c35a2a1a3cb942bb7dacaf9cc389c

1210911922574d258ae4e5d8a45298f3f8e797194d

1211011923574eb7ca78defa3f0acd739a659a6d6f

12111−574f93707d81b89d3706c13afd9ec714

12112119245751dec506f7c66df4bdee121b04f7f8

12113119255752ab43e81015b545b4645e382a4b98

12114119265752ee63cb0815a50e386bf7fe8a22ae

@@ -12237,7 +12049,6 @@

1223712049582e9bd7174281fd891627861b0ed53f

12238120505830760d5d69ba23232ec1f3f83842f9

12239120515830cdfa1ef57800a0b72a3ffb5befd3

12240−583173b28cfdfe0c1af96802545cf9dc

122411205258357c8c5da853a168c845628b27bb79

1224212053583628e868a6b38988eb68538eeb7c89

12243120545836b45ec0cf29436c447a5758ee5460

@@ -12256,7 +12067,6 @@

122561206758446803d8c0f9b1ee0e22bb13c2046c

1225712068584643528e061e2994c8027daa5201ab

1225812069584a627bc4825712625ec240d4f5b8d5

12259−584fc45661e18c082f676b6a680ab9b2

1226012070584fe417a34b4895e31b8b6512d10bcc

1226112071585607805d1b9db98c054ae968ff95c5

122621207258592f77f7b952d31dc69de853571d01

@@ -12414,7 +12224,6 @@

12414122245963f6cacade1e2192b3f8c0779006c4

1241512225596431a846b9127f689d11910f0b0c51

124161222659645e5fb68bd1ed93dcec0406a2a77d

12417−5968b2f1f6d4b3406997b7f7e79240fc

1241812227596a244d85b83386a2462fbcc7ede21b

1241912228596abc1123523f570a3ff80a6919ed7b

1242012229596be6175cbc554aa579e421503e1d1c

@@ -12436,14 +12245,12 @@

124361224559903fc455986aa8d2ff9b854c5f88e9

124371224659911ca7ba509119c85eb0ff6435576b

1243812247599460bbf98cc0e3d5b5bb3c12fbe9fb

12439−59947ecf9f3214f4c58117d0bd0ba6ab

12440122485994b7a3e44720dfaf90a24ef21eb255

12441122495999359214e8b53898baff4ac51cde55

1244212250599b76545d5f77f36d377f029b94db2e

1244312251599b7690185e8fca6805236a428e73b6

1244412252599f1ab520f921d45563ca41d35aac73

1244512253599f3e2b59db1fa9be48eeac55f0a6a5

12446−599ff3d0b99308a8746aeb7e9711440c

124471225459a247e217298c6e177bb01d20b68b14

124481225559a34de450e4fd6808d6a50eadc9f526

124491225659a40940d13f68d4334b3bcb12c7fe86

@@ -12668,7 +12475,6 @@

12668124755b2acfff7cf531598ca1f37d4b0a3808

12669124765b2b0af5f7539c133089f60855570e57

12670124775b2c1cc770c6a14150cd0cb86e80c362

12671−5b2c5a087a2bccd5dd4d523494cc896d

12672124785b31a16769b27d18d83dd0be28f3d339

12673124795b328c3fc42e14204c9db754d18105fc

12674124805b3449b95d3f74564097002636524067

@@ -12791,7 +12597,6 @@

12791125975c06cd201c2df97879b45132437ad992

12792125985c09133bf45c852a1aacca73b7329d05

12793125995c09a6f67271275ebe0df6d1962bbead

12794−5c09f1c614b0cf95ac7b3589ae36b137

12795126005c0acb8a6cd92af6ed5b4d6d6e04f498

12796126015c0bf895bfb5f7e64bcbee916005ff31

12797126025c0c50336ba6061140dd253b74e6dba1

@@ -12819,7 +12624,6 @@

12819126245c3e00df4dc2f3f984fe2973c64d9845

12820126255c3fd8c572a18ade9eaddd7997cec72a

12821126265c42b40b302dea1f942c455d3fdb3b84

12822−5c4554446dc83e51b3d0c04e5774f385

12823126275c4bcece70de961bdd5df2353b2ab3ad

12824126285c4c234a35138f857c115da817c2d387

12825126295c4d7eaa1f7699dea14bd5bc5bf84a5b

@@ -12854,7 +12658,6 @@

12854126585c85688e2e00aeb70038f24a3f142f61

12855126595c85d1b4d869a923a36deae91626580a

12856126605c88ce714f4b223c89f6bbe31ced301d

12857−5c892535c74d4b9dbf29db48b3997f92

12858126615c8988dce448ef446c2f68471b9a7bda

12859126625c8b8bc2d90d2217a2dfa33e1cdf9787

12860126635c8d3e6a3fd00cd81b447357cdc49d77

@@ -12971,7 +12774,6 @@

12971127745d3f8199d17bad19bb0dc8f8aadf16a8

12972127755d415c585a4ecd0e9a949b807eea4c54

12973127765d42e741ad85e1523589c0868004646c

12974−5d441f2a53c15027fdb230f22cd5b1ce

12975127775d453ef77f525eb3b896981052555e1c

12976127785d49183f81e65d621b8d25a433d416da

12977127795d495a76bb15de81695df2e5aa578626

@@ -13092,7 +12894,6 @@

13092128945e1ebd340c9698efcc8e5e0467a236d7

13093128955e206267810e3f0c952463fd42edc9ab

13094128965e22de1f373a4ce556b92378aa36e939

13095−5e246461222199a12a6fe3f1c03ce35d

13096128975e252b1206716ea0fa0eca40da6fe507

13097128985e278216502d5828f323c7e3689e9980

13098128995e29c7f6e408858d46c9c01c8ea45e44

@@ -13101,7 +12902,6 @@

13101129025e2bb9f9ea61b9366585caaff6ca754b

13102129035e31ab98969a09f5cf838b1c5553b2ba

13103129045e334cfc14800cbe82717cafb66c3227

13104−5e35011920497d580d36b2d566e639f3

13105129055e378551cb037ba53b6db6cc8925e8ce

13106129065e37c72552eb748993b1cef6c52272bd

13107129075e3cd6424220f8885447730b2e572531

@@ -13143,7 +12943,6 @@

13143129435e849e09221670f35f75c4d34cc145a9

13144129445e86070a356d2ed4a036a28bdca8e059

13145129455e86b84765be8eba76e7620b1e40e931

13146−5e8b88bcbfb24a37bd8fc5534552b152

13147129465e8d7345618f025a78644962b0ec28bd

13148129475e8e1d139500893bedb076d1dc01ce03

13149129485e945f28c037d057178e3c40b0b08fcd

@@ -13154,7 +12953,6 @@

13154129535e9872159973f42c3c6ca127f910483e

13155129545e991f221f160ef2b29f7d7cdf28d444

13156129555e9eda907377c7bbbc4ddf252530a8a9

13157−5ea311d64891c8828bab38edde460f53

13158129565ea31ebd6a8abf232e6ee2def4a3c1aa

13159129575ea4aab0882ee4864ec36eb4e07f2606

13160129585ea53e34eb494c2fc9cebf3c73b2ee7b

@@ -13189,7 +12987,6 @@

13189129875ed8b85057924bd2a6385e3ceb8d37b8

13190129885edc098376bce3a48b81de182c18b4e8

13191129895edccf52eca8033b46808e7fb898b7d9

13192−5edd2fefde21a3164f1853e7020284e4

13193129905edfbd19bb7f1850bd6a7af61623a539

13194129915ee6cb6f97474864bb9c5cd496b78df3

13195129925ee6ee7e04645e000bda30ad53bbb408

@@ -13273,7 +13070,6 @@

13273130705f7e3b31e52bdccf9575e4e37c5000e7

13274130715f82f8572629d1762dce804cfe27dac6

13275130725f836cd77d406a15c229ebd4000ee0c8

13276−5f83b54d0e757d43ed9c7c2865fdd906

13277130735f86313b2e10abc3980545b82c68bff8

13278130745f87fed679f1bb16ac45b3f39c724a68

13279130755f8a1492abe655392be6a92531c0ebb1

@@ -13306,7 +13102,6 @@

13306131025fc11181759d4d5440f2db916366d116

13307131035fc54f761f1d3e2b418955c88db80e24

13308131045fc73b574b425da4c4a2049c3d9ad39e

13309−5fc79da802fbe1557d6a1da364baea80

13310131055fcce5c19d2e8d1ec5796a8a77f4e431

13311131065fcf44ff082f35ffa4c1e97800eadea9

13312131075fd115ae834b2471aef74f2cca747601

@@ -13436,7 +13231,6 @@

134361323160d9012f8c219237973102647d1b59ad

134371323260dcee357d820a71732e3a04b21444ed

134381323360de2bf77d24d11468163772305339cb

13439−60e5207a274abbaa9c08b55fc6c78322

134401323460e76c1d210f64e28edec50881f8f0d2

134411323560eb666917d006cc03c206e4c727893c

134421323660ef3180b60f8f975807b506a061c6b9

@@ -13540,10 +13334,8 @@

135401333461a1f982d85deb6f4898c0a693b3140f

135411333561a406ee4b79b035ed3edeed7f533a07

135421333661a6437b2aadcc5256bdbad9626b9f1c

13543−61aa7aa7c17afc262d6088400ed3a3ed

135441333761acb9bab5991a2656310bdd772adb2b

135451333861ad0902f30aeae388a98254e5e22a1b

13546−61ad67d8d8576f3d6d0b9546fa4f715c

135471333961aead9e5d20a9d431a47df92da08194

135481334061aec8b05686621e7cf47d14ce3cc728

135491334161b00cc217168aa8df111b0c1d448b8a

@@ -13579,12 +13371,10 @@

135791337161e53134b982c19f4758f4ea4a25d47d

135801337261e76ad43a46244e120631dd97c7c10f

135811337361e8703253f468f13b3fab2b470d1050

13582−61ebcaca0fa49ab276fe51a643035aa9

135831337461ec3fe87a46fe5dad7506f574a9143e

135841337561ed3c07ce1dc11404b7ba241fe6f30a

135851337661edcb90bfe8e93794035cf0ec5055b4

135861337761f005e0316e6a33ecd85a7a840d1a7f

13587−61f023ce7228c3525988d1084c8272d3

135881337861f4681707f33c7c73c85a9e0fa9becf

135891337961f7e5591be2727ef323a0983a782c24

135901338061f918062cdefed259999e4fac188649

@@ -13593,7 +13383,6 @@

13593133836206a0bfac0659c0a7ec19ba47da6fb4

13594133846206c355c888ae5c84453c24b04f31cd

1359513385620c34d90d8d46582e835f70df88db99

13596−620cc354049f84a4601298938ac8e822

1359713386620d260bca94827279a172f0408853e0

13598133876210c681468317d3d1fcddd098a0d812

135991338862117f7fc5a1f3350b2476de6c00cf39

@@ -13636,7 +13425,6 @@

1363613425626023d31030d2d4ea784679977fd1e2

1363713426626055f143412174f5a5ccf9a264c756

13638134276260db919aeda9032226d7730719923e

13639−62642db3cfbe7272c762354f8c2902ee

1364013428626535b65f8e6390bb80a54dfd189334

1364113429626b2d894d0930e649815820c74f82e9

1364213430626c3d600313bbdb4930e9f94da7965b

@@ -13680,10 +13468,8 @@

136801346862b5ecc8d63de3a0c682e5fa83b4e6e6

136811346962b9b63af083c574d566022687ca1269

136821347062ba1e72ec6c141fd1d714f47cb29466

13683−62baefedc59c779011f2de31e673e5f3

136841347162bc4d7b6901faed53cdb3ddb103c2ed

136851347262bc65382a4230a4913825a90081f2bb

13686−62bde25c1c578ee363c8ba5f40961f7d

136871347362bfbe0dc0921dce2f0cff73874a21a2

136881347462c0561aabf989db4df6ed023011f312

136891347562c107f3d19915a3debfbb1d487ecd36

@@ -13698,7 +13484,6 @@

136981348462ce2fc18c76c072a1fee6707617cb76

136991348562cf52ea6b0eae23bf26d29f555aeac7

137001348662d122eaf1ef68936a00002d792e26fa

13701−62d2751296fbc6fb6980a0aec4fb5df5

137021348762d3cdc386d8c93ee4d2480408cc18aa

137031348862d58c1235151c27ea499d9b731fd907

137041348962d98b3bc75ea0b8ccd4a08e3e4127ff

@@ -13732,7 +13517,6 @@

13732135176311522bf92fb666757c17d4a039e9df

137331351863115464a68602a5f6af8409fba52631

13734135196311e3f10285201f9208c1a5513829fe

13735−6314e06e193861b9537eddfab78c6631

13736135206315fec8a12ac5c9565c9c337882fed1

13737135216316c8aac81603eeafca353921ecde04

137381352263177b0b5e823a090c31c0b94c5a6ca6

@@ -13809,7 +13593,6 @@

13809135936381e551008a356862cb8003e83794f6

13810135946382b91795333a71e37879b1f4ee1578

13811135956384294a7883ac653dc374838294dfa6

13812−63872fe01e0625421101f882d778d0a4

1381313596638746829397573341b4ce8be96c89ae

138141359763893816aa3b139332d0b03e35f300ec

1381513598638ac12243bd3bb1c728504f3e234a04

@@ -13908,7 +13691,6 @@

1390813691643e3c4590206e455310c5688a1d245a

1390913692643ffe77569245654f293fec82577f91

139101369364416e9b6a62fa2d58e04c81bf1e870f

13911−6441b666d75f75eb4d92ae8b50c1b60f

13912136946441eaf5c46ecaccaef98350ee1e1bdb

13913136956446da7e20c8f6f1c828f7c0b0d6813e

13914136966448a059fc8117ad8d4eb9e79b533d00

@@ -14037,7 +13819,6 @@

140371381965370337bd6e72ab6e7387316b56a183

140381382065381acd37fbd31ec7332d91c24b9e62

14039138216538af985e7b29789a76b974e0b904fc

14040−653e0d85da3a3ec2153c15e69018c068

1404113822653f59359044ade07b8f4eef68072bae

1404213823653fc3b81b7e0df95fef88fb7e160456

14043138246543a947e7b77866c8e6a73914ac534b

@@ -14095,7 +13876,6 @@

14095138766593fa792f7b02f26e6f0a2ab1a70010

140961387765943738dab4a8c5c2b328837cffd484

140971387865944c8d6430d1d882c179c7d3ec7eb4

14098−65988aab527712fc34055cb1c6db60d9

14099138796598c6ea38d69d69b59fb28bdaf56784

1410013880659aa65725a6054644cd1cfe49635d1a

1410113881659d818df07f25384223a873237cd7b9

@@ -14150,7 +13930,6 @@

141501393065fd2134e90a6e24ce1f1c56962044cb

141511393165feda8333a13e4e9201d46c3c6fc87c

1415213932660081cc034cd7c6b071f4fb0529fcdc

14153−66032207a797c8a3ff798bad60c7c416

14154139336605c86dd975b842ba3c263c866578ea

14155139346605f3d5d0903ef7db263b5233e53f4d

14156139356606bf470076976cb33bba5b3e16854d

@@ -14197,7 +13976,6 @@

14197139766647f15889ef674bcd8240214f323d6a

14198139776648f617721d110dc7564a4fd85fc0c6

14199139786649415c6ae156447930df454a136b39

14200−664abc5e0b1dc23aad380b3b3c2c5fdb

1420113979664e51ef7e25ba774c15688309bf7c85

14202139806650684526b3c0f5a10eee0f6b790fc7

14203139816651499eb91df180e3f81c193f4f0f72

@@ -14225,7 +14003,6 @@

14225140036667c345de226989e753f6aabe8f374d

1422614004666811d46ed32cb43c4a1008a9ad3d26

14227140056668549f2d390202130a53edb2159ec4

14228−6668e00876de451b4c4207c6737acd3a

1422914006666aecdeb02685ba13bca9fc2d94986d

1423014007666cade985d9661d8d117b8512237326

1423114008666fe6a63446193d91a1e9220137b0b8

@@ -14245,7 +14022,6 @@

14245140226689fab2786bfbd09bd2f0985a20724c

1424614023668a0378dec91781a927d68fb642a4be

1424714024668ba652cca5a910378b274c2281abde

14248−668d3e42c90e2485e69dd27933ab5446

142491402566923419f319336524da65f146dc3bf5

142501402666983299fb4e30741f875351dbc3e2a4

1425114027669d8f442e6f24cf7b6ef3a4ae523423

@@ -14266,7 +14042,6 @@

142661404266b0282b24dc1c1aaf42d06d6014708f

142671404366b0a5d6b86c709655d2b78ae7826074

142681404466b0b8378c191e31b1b5343201297250

14269−66b2a17fb45b7325e1901a531ecdac87

142701404566b3ae0f238d0da08e796e87200c41a3

142711404666b5b24ccfc9e86027551fb475ba8f6a

142721404766b687efe8ca1433c52c9c86e2ef9d18

@@ -14296,8 +14071,6 @@

142961407166e03bee0dbdaabc5aa949c097e03964

142971407266e6046c2c0a62d3a1835faa95a2cb18

142981407366e64fca3c833fd875292761071ddb63

14299−66e95be6727965bfcf4bba7dd21e9b19

14300−66e9dc76040ac238f7a57677bd0abfda

143011407466ea50cb45110cbc8980600f832f801c

143021407566ec2d4eedb9ab3eb0bb39dc5a96dfcb

143031407666ecfd0e211ebac37bb6dc72a3432436

@@ -14407,7 +14180,6 @@

144071418067952d5995855fc0d8b2c3a9914357da

1440814181679b390e4e14fe8f487b074a0eb75abd

1440914182679ca442fbd0591b564d8a7f011ab155

14410−679e4289818511c6e4699f8768ba9349

1441114183679fd11c1519a8a576f21eb0d4a43d80

144121418467a082af5b8ceeec2e00724c5faf0d54

144131418567a15c36f2b065f6b0f30a5bf4aab082

@@ -14418,7 +14190,6 @@

144181419067a661baee35a3430b0136128bc3551d

144191419167aa6780ae602300d0e1779bdf58e54a

144201419267abd1ea9889e6682c8a9c988d98668f

14421−67ac4461692b6306330ae8f39a9757e7

144221419367ae2b1d4448628420b831847f86c84d

144231419467af80d4e70d5937ec8d5bdd16fd5dcd

144241419567b1a62ed76c0d17dca93945bf076448

@@ -14488,7 +14259,6 @@

144881425968190d55f6ea6020afe5be0fdee19641

1448914260681954c88b7cb251c0211411dbca2433

1449014261681b442910848f90c134b7823308ed98

14491−681b92d41a65fcae128480fa9636181a

1449214262681e6a5186b214bcbced167395b4ef19

1449314263682033bd32d95f382ad78e4cde6af770

1449414264682173c0a49f6db73dbcf66ccfd1dd16

@@ -14697,7 +14467,6 @@

1469714467697285f312b25d17f05ad8d30ea8f0bc

14698144686973d6480eeb02baf665f9a235db850c

146991446969766959fafb8982d39b13c86700db49

14700−697831a2811912b202445ca5be0efedc

1470114470697c05ab5352aca9ec654104a23b6e70

1470214471697d2f8a8b1922e000b640b2904f55d4

1470314472697dac063e6746251cc825f5b135aa5a

@@ -14745,7 +14514,6 @@

147451451469d7a0286da31e885a85e62c77064c60

147461451569d828844f960bc9a675c1b1d3b90a5e

147471451669d8e66f4bbe5e89c8f1f9f230a9d387

14748−69db3d300ff1fc897cff80654d3787a8

147491451769dc2ea9ef60bef771756260283c253b

147501451869e22efca6d3d6d6f6720769cb383131

147511451969e5e61f392b138b8a60a0e01ff1111f

@@ -14829,7 +14597,6 @@

14829145976a77f1a1219a75711094822384073b86

14830145986a7a810ce8213a04046053e80bd4f876

14831145996a7c627c9eae25af1f2f8dd16252f5bb

14832−6a7d60cd8aad67ec4338cb933d34f69a

14833146006a7db68c79289cf85508d35e883b6600

14834146016a82a269dd41fd6aa65585f3b818d839

14835146026a82a5fef0ca8d90954e044af1b90e55

@@ -15031,7 +14798,6 @@

15031147986be04bbb4a2d74af862ce3388acfe46a

15032147996be08506e914784ca5f2d99fa757ae9d

15033148006be085818e722b281085c05a0fb46831

15034−6be18d73be5978fc27cad5fe261b21cc

15035148016be47a74644fd0eb185dece01d31b0dc

15036148026be709e93fb3d26c7184d0f7829f2825

15037148036be73251574b3e6318ba374858b13d79

@@ -15045,11 +14811,9 @@

15045148116bf9e713fb27e24dbe124e0d8503458b

15046148126bfc027794c9f72f417e10e4713a5aa3

15047148136c020d4c3f83f86c4e629497e872a914

15048−6c023b923352f6618c890660356aa24c

15049148146c037651131bfa50414ef24bd7a94e0c

15050148156c0bf18262dcce03019dbb45a83ccc28

15051148166c0c00d17f1c1ed64dc7a6154ebc0753

15052−6c0c9305d77d2e7b05d2baeed3a6fc60

15053148176c1142b431d305efcc6ea8da1308d164

15054148186c130ba270cb3d4c182f2986b9cf3ab1

15055148196c138f5becff39c23040bc950a88d0dd

@@ -15112,12 +14876,10 @@

15112148766c92049ab0cc5d4c0772d118ef7ae2e5

15113148776c950ef65e80c083628d4d0b19cc17bf

15114148786c96ab98b191027801796cc9489e0ae6

15115−6c98887fe66a9b66ef09a57949dfcc0e

15116148796c98a86a0dc546c247bda66e4ba1e70a

15117148806c98b2bec3996bf1e515fc66680dd7ac

15118148816c9946aa3f2b24650f11dd3f82892f4e

15119148826c9d4162d44c624b90a1238ce75b2abc

15120−6c9da575091f4eaec4f7323b96c5062b

15121148836c9e4e04c844505f9e5820833f4f4e24

15122148846c9ee5307e0930c9c6fb720bf55b45cb

15123148856c9f25b9522d4e7ab697d8df51153b70

@@ -15139,9 +14901,7 @@

15139149016cba0875d9f1143f67ba724ddc0f9f50

15140149026cbc209a23896b517138943fd042c4a7

15141149036cbf350ccd968fb8ef055677d0cc1728

15142−6cc02dd4f4eb9d49cf50eba4ab9dc89e

15143149046cc05ffc2b875424cda9ee3c48b83d71

15144−6cc06e4c17c5ddd430a608ae7452c373

15145149056cc4b0ecc0c7158905bfb77fdb83604b

15146149066cc4dc4233ff9305a95d50666084873e

15147149076cc5afb7c5967218768c1bc63935825e

@@ -15190,7 +14950,6 @@

15190149506d167077ea49de07212e30651b6ea3d6

15191149516d168fe0b4b172203271b3e2cb82ea6c

15192149526d1b4fddf9cbd47ffd0b5c429c7926bf

15193−6d1bd4ef7293d195ec61735acb2e1df3

15194149536d1c8c7df4e04ee1f5726775b81bd34d

15195149546d1dbb6712d7ef76a659d56d43d3711f

15196149556d1e016f565af8f69bb8a09bd563d84e

@@ -15228,7 +14987,6 @@

15228149876d5260490e71936ff3adb479bed5b425

15229149886d547520df5d06eac235eac03a960b59

15230149896d5783b961f3fbcd0ec9af0de674b5fe

15231−6d59fa5e6ab8c27110548eb20119e926

15232149906d5e78acc718252d273e4c5b717bde82

15233149916d5eec73b6541206f43a71196674c79c

15234149926d612f119504b16d83896a1911b5a538

@@ -15374,7 +15132,6 @@

15374151326e4ff8a672dcb6e7a85c93880c802f83

15375151336e52b4d5690d8425a050c4b99fb835af

15376151346e533b14680595ebce5a3d1f4605f78d

15377−6e5341d73b11566c7dac342f40b0f529

15378151356e54cf7b22f7f730caadf8a53a236db1

15379151366e55d5826ca850f2a97570674dc12d97

15380151376e59d3eef06c237da0006c85479e7438

@@ -15391,14 +15148,12 @@

15391151486e6e60018417ff14809bf5a6a78a50fa

15392151496e6eedb54c4330103ca60845c3014fc0

15393151506e70021296f93102bacb65a4c96618b2

15394−6e704875be58935346433188c3170da3

15395151516e7292cefda5953128390c28d9c208cc

15396151526e73a963a7e609fe0fde50aac48687ce

15397151536e749a4466dbe912ec56b4b854fb553e

15398151546e75ab9eba0f57dfd6342df4b94d3776

15399151556e75b52b74a192f7a188d6bf07e882f9

15400151566e7e573c74884bd5550e1bde013a1d25

15401−6e7f3a53ab722699f7c7d39ccae8bb5a

15402151576e80b985b3f6cda4c0aa0ea210b803b5

15403151586e815af85a34d31bf91f746d69b19e82

15404151596e845a3118cd850856f20855ad3bec35

@@ -15444,7 +15199,6 @@

15444151996ed743bb8135e90cc3b7157a4bdb17f8

15445152006ed904a7c60d842f061bb76be0a4c456

15446152016ed96d4bf928fad2b6811ad330879d2a

15447−6edac8bea4689142c93541469bdd6c38

15448152026edb2c310e7f6d6bf6b6f57e77b9ad9f

15449152036ee016c27dbecda811ab19724045195c

15450152046ee257b4b8f911740007be2f5277ef26

@@ -15526,7 +15280,6 @@

15526152806f79e1ecd1b25404eb07ef6cd7bd335d

15527152816f7cdbe049500a29ca5200eed73183e0

15528152826f7dc6472c189cdb87713035856355f3

15529−6f7ede37ace73c066a324dfe620c127e

15530152836f80e49e6d46d8ed13cd57e62c779c94

15531152846f81d178c3a2d2f87c3fb422927eaae3

15532152856f842c1c2ef7ceed2e6e16153953668f

@@ -15564,7 +15317,6 @@

15564153176fa874c2100da27f4a14c51dd78b2462

15565153186fa8ba9c0ff1d474bf71ef56431c775a

15566153196faa804f00735c8049c87446bf5bc2b8

15567−6fac69fc85008f3827f8b5cb2d1e4993

15568153206faf4609567a17c17aeb7e7c2dc16841

15569153216faf78de9648b90cf863abaf66a95a0d

15570153226fafac15fbbe2f48b8d46fb93b34335b

@@ -15574,7 +15326,6 @@

15574153266fb2b671e5a49af962cf17a63ff776c4

15575153276fb3d250e36030bc0fbfb21e9f6ea7fe

15576153286fb4c17a8aa687b22518fac921d4739a

15577−6fb5389416cd4f45e2c921ae0c6e6495

15578153296fb860a65a8d47ce0d0e3f9f8c0a2b84

15579153306fbe416caf0c60c1c1d6487eecf625a8

15580153316fbe8f8b377b94f793fdc87a4a95597a

@@ -15610,7 +15361,6 @@

15610153616ff5901d82d0e8a412e8a9498fa3a524

15611153626ff65014ec474d7fcb88d8a95b73579f

15612153636ff8678ebc305b8c87f901cc18c481fc

15613−6ff871f8c411976f8bf5b0aa0e40b757

15614153646ffa4bc9e779feed145f71b857e647b4

15615153656ffbc3df5df005db41c7adc321b49580

15616153666fff70d00ded4353883a3ac908ccf1f8

@@ -15662,11 +15412,9 @@

1566215412703d92b7508e3bc61b58bfffdb226a89

1566315413703dee7855fd99d4bbf48c928b0e0ed7

1566415414703fda1ae7717a7d1dee5cf9fa5d7fa3

15665−70450be9535f5ec4d8ab0a913ab6b358

15666154157045396789edb33a54b64de2c7b2a520

1566715416704614cafa5bb263657e2150b0733f5d

156681541770497cb1aaf0d0913ae972e0d591e178

15669−704a8d2c484c5f306e2a586e334e812c

1567015418704ba30354eb53d5f2dca0dad8ddf6cd

1567115419704d1fc5c314866aaecc6518f4404897

156721542070513e02f93f9f495a6e7b0e58773978

@@ -15717,7 +15465,6 @@

157171546570acb7f045cb0e67265e14ce399e4bb4

157181546670ad12ce765bcffa07ff30222e30b3dd

157191546770af9d0a4e8f9afdc4e85f561cb2fb8b

15720−70b0c3eb4040c7fd5b9f71f49b0dc4f4

157211546870b0f8a5bea59ceefda2acc077b171d1

157221546970b1976f379e70ac287ef33f4183b184

157231547070b1b952ad5534b61dab6d1564b38ea6

@@ -15735,7 +15482,6 @@

157351548270cda0ec549992322848971095f99a52

157361548370cdfdce881159f4bc101602fde9b547

157371548470d0c225d44fce9411acfa4be98bef56

15738−70d23c82936c3e7a25e6e812650245d4

157391548570d690dc629241971f51762253a5bb33

157401548670d7488bc68328e8796f2aa0cd3afa1e

157411548770d77093ba6589891c5f40ed131b9608

@@ -15797,7 +15543,6 @@

157971554371425886d5fe44e61c7a3a078b796bab

1579815544714896c3fd4610aa99f49d8909fa7dcb

1579915545714c92b0a4f4df50f863064cfffc2482

15800−714dae84bdcc2bc7d5063a72fd267cc2

15801155467151aa2035d8dffe075f41f144d0db00

158021554771531e5b26e95a152dfbfb8acfe5aa24

1580315548715434b54b25841426fcdf57193aea79

@@ -15875,7 +15620,6 @@

158751562071f6a43d2864aab38954d07873b99629

158761562171f839b30d480b43bb792388fbb28442

158771562271f9a584502855bd1e08b34827705d37

15878−71fa5c79c17002e70705d7ba5a6f33f4

1587915623720a2e634987bcf3a0fff3ae5ddc7e9e

1588015624720a47281c1bf4c490ff1f1ff0cf75a8

1588115625720a61c45ef33ac2aa26ea0eb99c767d

@@ -15982,7 +15726,6 @@

159821572672c8584925cf446fa8c1ba782cd63c3e

159831572772ca6fc5b5726046280509ea604f5ab8

159841572872ce3b8a62a34e7b78ba210c03f1fe00

15985−72ce4fba6b61a6c239c0d42385539c33

159861572972d2f3f08d8fa7c779119e4da1c27fa5

159871573072d731ed6fb3747db31bdf0291ffc307

159881573172d75e3b2a62d6b14978110bf0911d70

@@ -16040,7 +15783,6 @@

1604015783733303873d999fc63a7f88a18642e843

1604115784733740b005e6bf2370d62dfd4f55dac0

160421578573382b58a1cef711286464c280c3dd3c

16043−7339b3c7302d69cbbe0f32e4cc7144c5

1604415786733d793672b6cc061da0ef3f41e38c91

1604515787733d91cb67872dd577a1f7dd15ff487e

1604615788733e9e72be0274ad651442cd3ef3756b

@@ -16079,7 +15821,6 @@

1607915821738d2cb27ee0343080a94982dbf6fecd

1608015822738dfbf4885cadc6715b59568a70dcb6

1608115823738f595d489547be8758f2fafd972d21

16082−73900b5938afb28c5a238758743a05b5

16083158247391386407624dfed0ad5f10a78c250d

160841582573923e67457ed90a3c87529b606c1e1e

160851582673938b9e8685d0954a0e7e39526693dc

@@ -16106,7 +15847,6 @@

161061584773cdef0968d451a70fc7358c2aa7bf40

161071584873d2685938ed445fbfee036d73f35c35

161081584973d76b1354a940341aeb0d36bdb107a7

16109−73da10f665f3df7fe2ad128256ad4ce2

161101585073db0c9d8b142dc77348e7833b1fa6c2

161111585173dc5f64d89b534ebdbb00b54212144d

161121585273dd45c8045f8a1c1cef91c00b242f53

@@ -16131,7 +15871,6 @@

161311587173f857f2bdb7172196956fba216673fc

161321587273fc418ebac9d06d37998d3ca11bd9ff

161331587373fc523908a5f110b34ca01a29c45cfe

16134−73fc9dddd2e618dd8f985d16d05ccbd8

161351587473ffe2144e5025b16ff89f1ac6e3d8fd

161361587574025f5321d3f2b8860ada325a2bb6b7

16137158767403a28c4be18ff829c8659ad7baffaf

@@ -16204,7 +15943,6 @@

1620415943747baff0e4d6145cfc40696b2e5646bf

1620515944747ea4ee66192ad882f6d46359fe28f5

1620615945747f4b9c5fd7d13f1b2611732745a589

16207−74841f2899533f8db78c898cca15a4c1

162081594674850be58d8daafda6ee8fdf3d864734

1620915947748735160895517fa79a565f4395ff21

1621015948748742a2e411e0ae69f1c7c0d4091880

@@ -16232,7 +15970,6 @@

162321597074b5658bf5ebe05f717dd07f29d6ffc2

162331597174b5b1cfcdef5ad6f9bb7f2552456711

162341597274b677479b37e69e511ce9fa5f892f83

16235−74ba1a053251c09486f1e39a9ea44259

162361597374c087ac78640c919782870ae10c4184

162371597474c0eaec18664d62e1ea109d23b4e906

162381597574c1e464a293a74bbea5a01824df560c

@@ -16322,7 +16059,6 @@

16322160597564680e8b3c07b21f1ba1a4455aac21

163231606075657eae2727d6cf4dc34497389d74d4

1632416061756680734afcc311edcf454a07dabd90

16325−75685b8a938a55d4f2fd197f425e9f21

1632616062756860ec198201b3a3d649df4786ddab

16327160637568af5cae93470f3586674730e1a8e0

16328160647569bb749bf0e2b4a04de72a1c091485

@@ -16425,7 +16161,6 @@

164251616175f8303d3a4cf645ba4775b5613362c0

164261616275f84f68e5f5daf2c952c84412a4596d

164271616375f8fd9ee97eee2c358f2a3c9ed6cf39

16428−75f91ccd0cd76775505d988e04d337d8

164291616475fa872f3e9531ef2d0b8d765974b89d

164301616575fe010881c622d257e78634062bc2bc

164311616675ff52089492e16421019fffed59b09f

@@ -16449,7 +16184,6 @@

1644916184761fac49aa7858693deeac7b58cb7578

164501618576255ebecb5260109751989e93cd4da1

16451161867625e6819d152c59aadd211ac0421c9a

16452−7627eb28c53f9a931c3c042d50304fda

1645316187762b055b60a9af079841ea320c28a4b7

1645416188762c800b0beedc00ad25bb08ae2d727d

1645516189762e189dc74bfda111aa65078d333e8a

@@ -16471,7 +16205,6 @@

1647116205765dbce76e64f5e24eea46fc89a9e380

1647216206765ded42ac52169e9d148dea0d7fbef9

1647316207765f2d1848f5f9d3c8ed63f4618ca0a6

16474−765f7add89c065c13c3483026d3082a1

1647516208765fa79ab2a1cb5f6bf086f7c2c1f26a

164761620976607325dbc512bae1ec9ff6e926b517

1647716210766238dc39940cfff4105f2c6cc48b73

@@ -16479,7 +16212,6 @@

164791621276638822d2c4b1d5860e1081467ef8dc

1648016213766505e7b08068bc5f62317b74c8bd41

16481162147666c7c68e986e2ecaa651b215337530

16482−7668e487efce447dc84aac24e0dfb616

164831621576697b8ab0155ce1b74635ca5950f149

1648416216766b2e79a4adf32cc3c5d6fda95ce9c3

1648516217766d2d365f92605c2fb8ef16495743cf

@@ -16709,7 +16441,6 @@

167091644177fb4e91f977a000b417cc5a44f99680

167101644277fee2fd1a000fa4186186bf989e026e

16711164437801579bdee0f8ed243ec22b48c8c991

16712−78019a7e356738eb6e4722be932346b2

16713164447805845520fead33e6abe5a7563cda65

16714164457805986fab6c7f4137febd105079e668

16715164467808662175d47e184382a36a20269865

@@ -16794,7 +16525,6 @@

1679416525788a131a4603338ffd99640c8ed08919

1679516526788acc82e61837142ea96a0fe18b861f

1679616527788b53e6edbea8622deeee183683aacd

16797−788ca1975b98783c5f6388b7221a246f

1679816528788f3fb1dd4a1ebb98a00673c2f74c66

16799165297891d8524ddf09b39c3a9fcebed6e547

16800165307892ec8ae855cfdffe02d08f6d892dc1

@@ -16987,11 +16717,8 @@

169871671779ffaf8082e825b497d39fba6314f02b

16988167187a004af390ce64b63708dfa65afe6e20

16989167197a00d83d51c910292d3b97c753534b7e

16990−7a0195e63af4c6637721097584a19773

16991167207a029e72dce9d5772809d9b9b76eb854

16992−7a02a152a071e2ffdaae84c86c52b90b

16993167217a047d89c889154be8dbfc794f163f12

16994−7a090dd90ea8e60cbcd9090647a3b024

16995167227a094a17dc374d06f822e101511af3b1

16996167237a0c91856e1e0dead7e2977df4fd86e9

16997167247a0edaaf0d3a3074e3113632181b5114

@@ -17105,7 +16832,6 @@

17105168327ad46ebe0aef62c6650def37251394b5

17106168337ad55bc2e4645975e1f1e982843ad895

17107168347ad6868e5ecae31c98dc9bddd59de89b

17108−7ad6a12d33629a50f2f82a356dd5b944

17109168357add00236520952f7368d976ebb08473

17110168367add70a1a7abce9d26bddd418791ddef

17111168377addbd9544604b943f1ef540a4617e1f

@@ -17258,7 +16984,6 @@

17258169847bc50f19180ed63af24c5835ef97af01

17259169857bc74d8c9c00e0d578b991f703b8cc26

17260169867bcf303489dd8e48259d64c78e59bcbd

17261−7bcf847807d9d0581834be88c257dd08

17262169877bd164bef2c79504eac96acc9e79f100

17263169887bd21b193bf2efa103aef06120ebabf2

17264169897bd39abebbc4f5a676dcf0f73838a64b

@@ -17325,7 +17050,6 @@

17325170507c32801eb8bd44d694ef1df6181cc0c2

17326170517c36434e66a30c0be90ae1954db68789

17327170527c36b68d126b5c4f456087b2b16a4c0f

17328−7c37ea72ad547f496b11cff67f78c364

17329170537c3944c1da4c9f8e9b9ddb9f3f46954b

17330170547c3d69e3b5a685d4a14e1863c1ac3fe4

17331170557c3f198d2628523c4d9313f7889341e8

@@ -17390,7 +17114,6 @@

17390171147cb2eec90180c45b6fb351dfbc83647a

17391171157cb6758ca6307602dc6c3959117c99fa

17392171167cb710671225b45a1f087fbdb437a876

17393−7cb87344f6e712ad4a0581896d3abd91

17394171177cba4bc14fefcc7ecef1e49cc69d514d

17395171187cbabc8502c46555d608e218d9438eda

17396171197cbd3cdf57c562f94b7a909fbd0187f6

@@ -17416,7 +17139,6 @@

17416171397cea22d990c99db98ab3557e55d15a96

17417171407cf0fc5679d337c87efde6beb4674c37

17418171417cf332718da28b4114e84616199044c5

17419−7cf58eb4b46cfd6ab02aa1af9c62d7ea

17420171427cf6b058285bce677d23a765626657fe

17421171437cf7cdc7d475b804dd4d9ec3e6725323

17422171447cf81c42a019a4a47e472569e4b2af21

@@ -17484,7 +17206,6 @@

17484172067d57ccceb2d54b54a595e971e73e9ef5

17485172077d58fa1363834697f3260d264dce4185

17486172087d5b0629bdc79379385d43fc5298206e

17487−7d5bbb2aab6dd2fe1e65c41ac3c788bd

17488172097d5d1bac3b691d494b6a5135741147d4

17489172107d5d7fc144475d0e4570690aa523d6cd

17490172117d5ecb638014e7eec7a053be0d20912e

@@ -17509,7 +17230,6 @@

17509172307d83380272eaefdfcd487c9db960f8b3

17510172317d835682beb54f37a9bdd4d563bbf365

17511172327d84a7615e85847c0e313a63800c8944

17512−7d8516388bbcf6c843e0a9ec7a21a787

17513172337d8621a17b3958ea744122ad5e28ce44

17514172347d89494402442054b5b805d4af80404d

17515172357d8acd079b6578e89e051eafe016f7a8

@@ -17570,7 +17290,6 @@

17570172907ddd8ed803905d958d2bcc6c4533a6d5

17571172917dddf4c2299dfe0cd3b0a048abbd26fa

17572172927ddeb951789296cf118875c137961448

17573−7de1f8f71cda51550798a4410e4a16f8

17574172937de208067d522cd94ff70ea7bed36691

17575172947de419fdb5788d46df45ff679979e1eb

17576172957de5d596b690088bd5f3eb7bfb43ccc4

@@ -17648,7 +17367,6 @@

17648173677e5008af79901eb1441ee564c7f42230

17649173687e511345dd2cdd7737089f4bf7bcbcb0

17650173697e5119c004ea79acf99a7bd3fe36ef23

17651−7e51a3795c729acf22dc2434f8b264bf

17652173707e51d111c63b0cf63ef22958a21226ad

17653173717e530645c6d5791549ae4a2938bf97ec

17654173727e54973abefb8f48aae539e1a317f0bf

@@ -17695,7 +17413,6 @@

17695174137e94440e7fe7cd5c17c766c2baeaa1dc

17696174147e9590403500a95a94974f886c9f9072

17697174157e95a4d23618d84998d276330ccabd9a

17698−7e961bff64d9577e7f92189f3d586e60

17699174167e9677876b2ddbb8036f28d9e2f52f20

17700174177e98a1d4d7dc18c49b553afee2e9b8ff

17701174187e98ee02383e04dc686f30de93afbd46

@@ -17750,13 +17467,11 @@

17750174677eed6e5676d94f3036b8e95958857fc6

17751174687eee62f49b725bceb2f398b0b70ffa33

17752174697ef06f46918b59b51f1918aae701a159

17753−7ef22df04a46c368591044abed30dc84

17754174707ef2eead9669efb6360552398388b4ce

17755174717ef6341d0b6b2d1cac54904cc9118bc6

17756174727ef642387f4068dd741deca3237c6571

17757174737ef6f91fb5e5d264f163bd9daf8abad2

17758174747ef92ca506afc5e34df42047c1c7ac2f

17759−7ef9b21d119356dfd515f6fa944c3e06

17760174757efa97acf52a2eff1d3d62deb5519d74

17761174767efb04f1ae37bbf5a75e097d91ae7d74

17762174777f02745e23cab68d541999a3569799b9

@@ -17901,7 +17616,6 @@

17901176167fdfc28eea63fb58b8dc481b2a109288

17902176177fe3468481fb452b1ee8c7fe043cefaa

17903176187fe368cb15650c400e6a55016dc8b2f5

17904−7fe562b676ff133e9c7fe179a825bab4

17905176197fe5e1d80f481db506bcb9c94d0ff1fe

17906176207fe79b7b43ff64c9d68564efe4efc288

17907176217fea19a2557ed753a90929999c2997ec

@@ -17950,7 +17664,6 @@

1795017664804c7712580b1520d59b2ff2e4a57684

179511766580518c73fa54eb1288c5dc540ee7fd6b

179521766680560da5eb084b79a1a326b46be3013b

17953−8057c6a210db187afd254bbe35879438

17954176678059460fb03bda1701ddee2502ee390c

1795517668805cd1fa1e874e070bb73e6613e49c79

1795617669805f6a49f2d2b0219282a7d7a8ee3655

@@ -18008,7 +17721,6 @@

1800817721809f21a913774f48bad8f4ddf613c3c8

180091772280a17e54721826002907f6d645899684

180101772380a8118a1989392238ce9d9558e9eda6

18011−80a8cab607d6eefa87f07a5766648d9e

180121772480a9f5979573404b8c28ede1a8f5ad9f

180131772580ade39a6c6d84897925c3272c88e4b5

180141772680af6e983181bdec1aa679cc79fbf5a1

@@ -18017,7 +17729,6 @@

180171772980b2ecb2a5ed4246232f6c20aec6401d

180181773080b5164257e7af08cd638d5adbe42d54

180191773180b55d61448121587dda2c3b1f4e5179

18020−80b76fe95c6316cc9a6e238bdba0644a

180211773280b86b2438d41327435761a559a979af

180221773380b916d5b1a9d2156e8dedf6e77ac77b

180231773480b9e7eda0ac67eb5618520fb2d14d8c

@@ -18147,7 +17858,6 @@

18147178588196cfe5b0c065b6abc0067ace6187b5

18148178598196f664df340f45e0b7e9a22c0a318b

18149178608197bc93084e778a1933ca6904b252ee

18150−8197d8ff9034112a68b73ff0f9d71c0b

18151178618199eadc3d87f1789d5f44dd63bf7622

1815217862819a281fa37afc6e7fefc02d88411e5e

1815317863819bb4b421fa00354541461f1a535c49

@@ -18164,7 +17874,6 @@

181641787481b0032835de15bffc089b4a92077ea9

181651787581b0eaeb439539b7ebc0bb21a056035d

181661787681b28dbaf46f619e71d445684ea163d5

18167−81b28f0954fefe5802cf03fb2cdfbeb7

181681787781b58a0d64d1f784936a5ecd41d60f24

181691787881b78a61482eff5c1d8006d093f9e357

181701787981beb8908f5e870f07ecdc6191cdad58

@@ -18235,7 +17944,6 @@

182351794482188706ae4ae926f3a0732ad9ba2dad

1823617945821dd2e4467cc269e089421fa7e5178b

1823717946821f57c95aeca1459e85c20eb10f8e6d

18238−821fd8d6191b1a5f0f691770a3591c59

18239179478220a30980c93e3d7fa81b0bf0bbc92e

1824017948822297a3b95c67cb4784c77e0ab7c000

18241179498223021ef8c2b88a53ccdb3b0715ae78

@@ -18263,7 +17971,6 @@

1826317971825260b580ee31ceaa2674a06d61098a

18264179728253e13f71b140b09f83d9a81d9c1c22

1826517973825606ea21672f51668b82903250479c

18266−825697728f369896e1aa7ca1efbd89f6

182671797482596d97a6205f8f07e1574243e35678

1826817975825ab3fa130effdf149255c13b70d928

1826917976825d9aabbcc18b29d9f8e0a9bf595f9d

@@ -18281,7 +17988,6 @@

182811798882737d45bc225ca33a7d31537e8af8b6

18282179898274ef499cc6940bd85feae096049945

1828317990827547bba55ac35f5e8ce3f3051bb96c

18284−82765b9d05f39c35252926b5406dc542

182851799182768ba559840008989191ee84a674e5

18286179928278a6637d88f935d931bf85c3f02f81

1828717993827de5f08e8f6b93a396aa883e137460

@@ -18585,7 +18291,6 @@

185851829184781c2757e4416ff42b987ee5305442

1858618292847a469e6530baa12aef2d1409e83440

1858718293847bee60bfe2344ffc188e1d1e461101

18588−847c6afaa376bc6e3aa90951a84e167a

1858918294847c9e63db01375a5013c79d384cbad5

1859018295847dab112da46ebc1c0178c02d701d73

185911829684803e7bc6bfc5ed423ae99436e4460f

@@ -18599,7 +18304,6 @@

1859918304848c29652541a7e3550dc27be3b87eb1

1860018305848d3095be7a3550c6d213888d6f89eb

1860118306848d79aea0b62c632e660a59da4986fa

18602−848d951f8199110c7d06aac5addf0567

1860318307848e490b9a79564b3d795091bf0b82d8

1860418308848f5d7b43d1143814b5b24b359c2339

1860518309848ff93398fb8ec0de7cefe9a4678961

@@ -18756,7 +18460,6 @@

18756184608595b19046d6ddf114f746504ee16a7a

18757184618597fc973b44b31ae6991d00d2628c38

1875818462859cba2c4c07bfab9d196d1bc1daa319

18759−859e216886320857b02e6d0d919d6890

1876018463859f6fa1e02a0bdc44da2ef614b38257

1876118464859fbdb8d3427e3f191cc5e29c5b14da

187621846585a00986c936fb0963319c95458f576f

@@ -18774,7 +18477,6 @@

187741847785b51be6d867461088452c9dba9fa390

187751847885ba9ce49738a495b71b589fc1f0baea

187761847985bad1e432da7438b5e5c13da4809c21

18777−85be1e2ce29b944df126107125e40d4e

187781848085be9f06344fa14968b7bf8c83f4b894

187791848185c0adc578e5c7c4cd7fdf61015490d1

187801848285c35f4943504b76dff92de1bf0b25f6

@@ -18798,7 +18500,6 @@

187981850085e1c6c50de43efdefdc48a76e772e14

187991850185e289aa04ce07feddc6c37b7867b93d

188001850285e597ea6017b70d49db82d48f2ff15a

18801−85e7fb50adc4546c0fb99d7fab733654

188021850385ed1f2c0bd0f21c8d58558ba618187f

188031850485ed655b587f58dac8b3513c3c7ffece

188041850585ef0c6dccbeb0f45e6aa4750e857cc4

@@ -18864,7 +18565,6 @@

1886418565864030863e59d7d5391afa57e5c67c94

1886518566864232c07cc73c68289c2fd2f58f1caf

18866185678643f4d05d024c9cf3eda4e135c0e9ce

18867−8647a44809158747080f9f4939f2fa70

1886818568864df149d409eb6c9837686ac58ed9e7

18869185698653c88ac7fafc4a98d53342b447b436

1887018570865485c3753da5f5e343d2c434ae327c

@@ -18880,7 +18580,6 @@

18880185808662a2eae9f9aedcb135120867a701e6

1888118581866670e09867d7a36009f4c383574ae1

188821858286677ead60d5e7e0ca8eb0be2238f501

18883−866a26f86b26627fbef07c152b46aec9

1888418583866af44aa737c1d01d728ed1e07b71db

1888518584866b1f697b1de6febac3760a93b55538

1888618585866bf0601da06e7790217f985de865e7

@@ -18915,7 +18614,6 @@

189151861486a5a3579153063c7f1222565fc1eea8

189161861586a5ee49a9f5b225be891cbe56947825

189171861686b043277522360e10d5a1a9ec855a17

18918−86b2212d024833f6137b258dc96cd3fd

189191861786b418f5ffcd92e89c186e5643b6518f

189201861886b731d0f4a55150239cb917c8b0f5b9

189211861986b9eb76fca4780377a1a72c9eacd9aa

@@ -18946,7 +18644,6 @@

189461864486f193ab198db71bbe970d3b958076f7

189471864586f1df1f382669385a6bb1647d707150

189481864686f422f92834f7fdbcb99f906fc04032

18949−86f5756286246fb2448550eeb3271a33

189501864786f63e4451a90ed69bcfe96d162e6629

189511864886f6b3754b1dcfe5f0935a15a315b43c

189521864986f88546761d918c23ab4808f3991bbd

@@ -19001,7 +18698,6 @@

190011869887456cd4c2279e2a3ed734df87b6d8d3

19002186998745904f602bc1034904265bf237327d

1900318700874609de4ee126c73c404fc7cb733407

19004−874bb3385e1bdd5b9909d8aa98683d4a

1900518701874cc597b327db2bc8ea8a3656fcdf40

190061870287515d569a3398cb3e0aa3e49378c81f

1900718703875294ab8b9a4a5ae7a472e91f109cfa

@@ -19043,7 +18739,6 @@

1904318739878b308c6e4de749b59e77708e04722c

1904418740878c448a5ab2000ad4169c968c6eeebf

1904518741878caa353a323fc18ff80556a2bbd355

19046−878ee861fb120e58388cbddbb5cda63f

190471874287906097355d402b3c223a6b6fe38913

190481874387917525f38c049eb4ae3fdcee2d0cf8

190491874487934d725d0fe38cf68052c06b352b96

@@ -19191,7 +18886,6 @@

1919118886886127b7185e6719dc2cd63663b9ecc0

19192188878862111313d64bde600dabab6f4c5b8c

19193188888862df0b61e5d102ea34f0241327e472

19194−88666cbd06301f070ea28893b7dd5a89

1919518889886908697a815be0e07752ad69b8ca0f

1919618890886b0fbadbe374623d2e8f156ddc15c9

1919718891886cfa45a3cda56508f4bc2eddd741ea

@@ -19307,7 +19001,6 @@

19307190018925fb5073cfb453b1bc713add61669a

193081900289273a96cc0cdb10cc11e2b384f1a643

19309190038928ef6b2f48b64047bdd139508e4e37

19310−8928f5ab2eaddccab3cbaf750a60ff46

1931119004892b53dccd474dddcc0f56e73f3b9bb4

1931219005892c78276f5b160e4ce38c7ba496326f

1931319006892f8f2dd1b23cb695d739b7e03b2bf9

@@ -19376,7 +19069,6 @@

1937619069898b2b1598f32950c5d221cd06624910

1937719070898d2967cb03dacf73293fca321aa7af

1937819071898df540b6b561b19606b16f469907f4

19379−898e4b4f035a1eeea8280f517a073714

1938019072899073ca3d2b142d0d6eed12cd2e3cb3

193811907389929cf65e777782b053e3343d320b56

193821907489931af57fc17b6f83daaadc03af47af

@@ -19386,7 +19078,6 @@

193861907889a0fdb1f8b3a5002be819a6f6acbed2

193871907989a28e6d71ad4e11eb15ff070a52d2a5

193881908089a3e1fded109b24d4e533704beff6f1

19389−89a44888e6c4dc32b7200b86159de3e3

193901908189a603e8f4328f2f18a4c815fef49e0e

193911908289aac74100a04d77dbf84f6bdab01724

193921908389acc66672e86b62a4c92832eeef6138

@@ -19430,7 +19121,6 @@

194301912189e6dddbb89b13d0ae0848c5b190310a

194311912289edff3df70ede6919d3c3db4e523249

194321912389ef08d3897e162bd2e6d7168205f855

19433−89f165bb3f7bc2daba154c3d0835c960

194341912489f1983dfaba17a2fad564a2773e3cb1

194351912589f4e90b4ee68090a881f04a32d4b6c1

194361912689f5d527f0648002dd3ab78755c3e547

@@ -19555,7 +19245,6 @@

19555192458ac01d301b7ff5cd4f3510c59e1693b7

19556192468ac03aef63ffdd59094010b0d5a0874f

19557192478ac10af6dd050ee6b0322d86633f72e4

19558−8ac2aa58ce042398c2533630f061bc04

19559192488ac4a65b87e45dbf63144fc62a315f0d

19560192498ac4bd53afc1ade38cf661be283967ea

19561192508ac7877cdab6b0abe16e1313c0e9506d

@@ -19592,7 +19281,6 @@

19592192818aec9a9c0652fad8a9ca08af96a854be

19593192828aed3178a01990787d25f6b736beb87f

19594192838af06ca36e4fef637aaf29b0978a7f9c

19595−8af1aefd2fb0fbf15bafe3a8b16aed05

19596192848af235481608387e49ead9488dd3a695

19597192858af3421d4635154c146c255597068404

19598192868af4dfed145ef20d7ea6f0a9056fdd8f

@@ -19629,7 +19317,6 @@

19629193178b416b22854a40d91ec5735cb11d55c1

19630193188b418059afa7b2bdcc560aef94d7b199

19631193198b41f556daf93d810c884da29b0c0afc

19632−8b421d3f18b987d61e36707282fc4e68

19633193208b433f760acaa0fb04611f4c812c2953

19634193218b43913acc89efebeb272befcf5d3ec5

19635193228b4629ba761940bfa1a9cb17e415a03c

@@ -19649,13 +19336,11 @@

19649193368b5caac1fc15573ea354aa5db05e09db

19650193378b5d1a997da00ca395d7be81ba021886

19651193388b5ed3dc115ccb7dab209e24edb9ae3c

19652−8b618d81ab210c369d850569b8e74530

19653193398b62684d624e6d5e5eb8b33b7ee3b0dd

19654193408b635abfb386c6efd9053fda9037525c

19655193418b64ab727581942bb7caa209bb2c5e0d

19656193428b6969880d14eb3bcbb266fa88ddd26f

19657193438b6be8a3777e232d46e067829b71884d

19658−8b6f218b4a3ef86ff520ff9e93b97057

19659193448b7027b606d7f140b427dbbd38f7a2a9

19660193458b7150f7f0bbc9ca56515e3a39f44017

19661193468b7477c363c6abb337a302b0450a3ca5

@@ -19705,13 +19390,10 @@

19705193908bb9a06bee364cfad34001d339ce217c

19706193918bbc024a1b59881eb0850ba6ac54aed6

19707193928bbcadfb79be01a36badb667e5795df7

19708−8bc24f47416b3052c4d1a91d0efec774

19709193938bc3af4ae8ad12c41c9a5ae2377cf1a5

19710193948bc6dff2ee45be0ee9d25a3608d37f9f

19711193958bc873396bffc3119cdd5c3118adbbb7

19712193968bc985cff6f59d3f9cbccf5835caa61a

19713−8bcc9d8bd8a08bfa8380a9a8999476cb

19714−8bcd154c0df3732f6361a0420e3e9b37

19715193978bcfdea1abec1d447a0b6562378fc86d

19716193988bd2f4bc3cdfae147288fc62fd79e326

19717193998bd442202186375c8ed9707ce2cabc97

@@ -19784,7 +19466,6 @@

19784194668c4d6a9a5002f55032be930937ba7dbb

19785194678c5006576fd56d2b36fe7b1b16e181b6

19786194688c52e3950463af2503f20e1d72532d6d

19787−8c55cae88406fab87c222ba0291fcabf

19788194698c57906b7afc82e5ed3c454634876586

19789194708c5943d95dc7fbcf7ed7ebb403e447f7

19790194718c5f51e61c7da214d8333a7bb1b38b47

@@ -19797,10 +19478,7 @@

19797194788c655227e5f6daad211a07cc58bce0ab

19798194798c6752a131501fbe826b92bc2c4e4718

19799194808c67ee9cdd5596da5789230f8d197c25

19800−8c6998253d2105c5117feb7278c21b2d

19801194818c6abde21bd20320c36a80c31149a0e8

19802−8c6abe02b0287c6ec09aa6c74ed7446e

19803−8c6b903aedf0410cf05900c03ef01eee

19804194828c6c4aadfb253f8fedc46f568066f7dd

19805194838c6ee2d3940dfbc38cd191a8884dcefc

19806194848c710ad168b1a6753d351c20a6fc1806

@@ -19953,7 +19631,6 @@

19953196318da468ba3dac51ecf41c8ed5f59cd811

19954196328da590b29bf63da90c0b01b1e603b2fb

19955196338da5c079b27249612da11dd7d96c434e

19956−8da6537c8175e9d4e48f8fbc234e2f32

19957196348da870b1d850914c18847e2a57e5b519

19958196358daf49dcd2be2f1798d036757d256bd2

19959196368db088ed3273daf7eb03d7b787bd690d

@@ -20130,7 +19807,6 @@

20130198078f0f46b488915eb53d276e2a1167c3ef

20131198088f1158695d2a7326a5ec4a6174bb323a

20132198098f12acfc09e45c48cc9c7945e32a10bf

20133−8f14da461e768f649fc624dd2bc25beb

20134198108f1a0b327a8ab7f38dcb67c0a18c86a9

20135198118f1bf0884c9e3d6b5ef3afcea4352c48

20136198128f1cc6206fbb4b6bb2c840e9cd36101f

@@ -20235,7 +19911,6 @@

20235199118feb434cea971fb73e5810a26313274f

20236199128ff43001bfa0790801809f3380cbc6b2

20237199138ff60a4bf8f842b49a00b82be20152a0

20238−8ff614530bc1d8e3938630d82d3a5b97

20239199148ff6ebdc7ca7bc970d03cc047201412f

20240199158ff95c0fecb08048a4f11903d821486b

20241199168ffb0744a4a697c86f2c4e3797cd675f

@@ -20275,7 +19950,6 @@

20275199509034840b93bf8b013f3d72d34b68982e

20276199519034f3515ddb27dc0b7910614160ef1c

2027719952903526dfd378e3d67d482a0712a60ba1

20278−90374253273d438253c50f11777d52e2

20279199539037e21a3750fab30a3654e17a1e84de

202801995490384fd9a7fac64e48ea08dd924d0d3d

20281199559038f9d79febdbe36d0b532cd79d9427

@@ -20290,7 +19964,6 @@

20290199649047da6f77f7c3004a4b2f96aa1b0b43

20291199659049757eb53543d528be2f5b26da9c18

2029219966904a4e53ef11ecb021a858b26a9f9e8c

20293−904cbbfb5825d47254b87a7a163d3413

2029419967904f826fb200ca0a540764a0ec741dde

2029519968905133361c38a893bebf41484d0a59e7

202961996990527313628644ebc0a36ea877fca1f7

@@ -20315,7 +19988,6 @@

2031519988908064bb3af304fc9ab0a38d8f2a6adf

203161998990849b8af9972c20995ec8264845052e

20317199909084cdca90a1b8194ba4abc24d836e99

20318−9087f86e4d69bb858d975ab64ba6738f

20319199919088f9cb7c1abd4e3dcbe3e97f780e61

2032019992908d52a24a4c95926eafea098d6fb559

20321199939091494449309c976b7ebfedd571ef22

@@ -20420,7 +20092,6 @@

2042020092915d6c3439a0ba60800c6dae4797113d

204212009391610f9fc477ee362eacf5ed155cc7e1

20422200949163ff6c8cf4a0edb46f0210d322fed3

20423−916640d4f86b882c5dbfda18b7ceacf0

20424200959168f5252be58d05fb0529dc58cbbb27

2042520096916973e03dfbf32babae8b71a679b318

2042620097916ce6f0727cfebb37723fbd73949233

@@ -20431,7 +20102,6 @@

2043120102917278fe396280a2abfc3fe28e6ea79d

204322010391730d59032766e96a0a3a489e9fd689

20433201049175f323276fb6275836aeca4b228777

20434−917cd84932813644b972af5b0a55adc1

20435201059183b8d5ab5b44707833863c58f11ce2

20436201069183c2674f84d031640fcda087b89dc6

20437201079183f5231abcdc099aee4cdc00f483c1

@@ -20497,7 +20167,6 @@

204972016791fa5634c761846a94136ed32860845d

204982016891fc26b3bbdf5b9579a37513003a22fd

204992016991ff0ec55f1100fd30638fd71b93552a

20500−91ffbbab63ef17dbae365cce7a7452d1

2050120170920074caeb020dbd9b194673c7c2b277

20502201719203836a259272de05b13e834ba5560b

20503201729203d41c547f00c21e950c68161ef9a8

@@ -20695,7 +20364,6 @@

206952036493a0ae7758fdd988027c2bf72b9ae594

206962036593a0c9093f097fc53c4179dd01cde90a

206972036693a8860bad9f442ebe8f32db068db6f1

20698−93aabb6404ed6184549c16f1a899c736

206992036793abf25378380a3f050f43b4a4676335

207002036893af1ea89ba5530ffe57c399a54fb811

207012036993b0f66d51601ff783dd2639b9471e39

@@ -20706,7 +20374,6 @@

207062037493b587b6cf45d14fc08c54556d60989d

207072037593b76dfbdf8886c1dab7d971da88e71f

207082037693b811b672555aecd352c022b51fe818

20709−93b9b9c660169523cf5532267dabfc94

207102037793bd9d6ed3eb8ec532c03a30df3a5ded

207112037893bdb71547fd7f1d1eb8efa50deb28f5

207122037993be78ede6240b20d81b76148d12e1a5

@@ -20760,7 +20427,6 @@

20760204279407e2a98e7a9f498cd18337d0a431c6

2076120428940adadcfa39021af6862d9ed052a5ce

2076220429940adeb70caebcbe5c73bd0450ca86a1

20763−940b9855a8f371ab5893d9a7b25c29dd

2076420430940ecfefc39cb15491c5b563dbf5d6d9

207652043194134f907f2f5b635c3d227f1310b2de

207662043294164f0a864e4e12316a7cdc597bce98

@@ -20798,7 +20464,6 @@

2079820464944c0cead9fe446ff7b68ee13997dd87

2079920465944f9b0a14f27e361aa1189467400d4f

2080020466944fe398346134774ae7095d8237e3a6

20801−945252227096842913457fbca2cb14cc

2080220467945357859c1f63f9500c9647317182b9

208032046894563fa32bbf3e04677c78f71682f8d7

2080420469945676fa148668daf4d7676a4c0b7eea

@@ -20838,7 +20503,6 @@

2083820503949da6c4c6c896c3a7692c2afed505f4

2083920504949e1cab9625367b8c1a30b5995defbc

2084020505949e5ba84dc8acf97ee6271b630ca5d7

20841−949e63af04b85cf2f1e58bed063d6264

208422050694a41b3d7a328414b886ba924dda2037

208432050794a5822e7b243198fd8d08f12f3c4035

208442050894aa85b75d1020dea3a48fe51148d06f

@@ -20962,7 +20626,6 @@

20962206269575002752a36ed63d12ca2b605cd369

20963206279576b02a2ab6236f73fcbbc757499389

20964206289576d41cf1fb5d1623d4b039f0e7fd75

20965−957749172395669b894339102c3d8a39

209662062995787222b92efa7aa9ef22231cc9c390

20967206309579239de038fbdc10e77ce2950b7b3b

2096820631957c4a5ca50886aab9f63fd2a89d7a78

@@ -20993,7 +20656,6 @@

209932065695b1d05ae0b3c1f487a1bf1b121df42c

209942065795b3e927e8dbf51cad1a046227b2aab6

209952065895b5827db79cb9404b469f59e0ea049b

20996−95b685efa645063bb6279cd5c116a99f

209972065995b69e335e66c424f2c027e31f31b886

209982066095b89a223a3aa9f85a28886bb257593e

209992066195b8f1409bca511c85df2e1955401c0c

@@ -21207,7 +20869,6 @@

2120720869973526a994fd3d8fbe1236849190e2e2

2120820870973793441794e526e52258f53e467391

2120920871973c4623a6e7da340eb60e5e320c97c5

21210−973d0d7d45186b481783f0cf7e481f48

212112087297441a83ab5ceb939f863d0819bd313f

2121220873974489a7d051f11d102d94bf28b5419b

2121320874974703fd7e0188c2cf42471c48a6c9a5

@@ -21343,7 +21004,6 @@

2134321004983d2e3cd6bb649bab0161ec785a6faf

2134421005983dc7469c8d864ccfe0e1b27d24e67b

2134521006983f6865f264a7eb3e53a4bbd8e8b12d

21346−98413fa459af714715a5e075a31e8329

213472100798474a755183568649fe96b2c1504235

21348210089848237aa4bb4bbd746db3e3abe334fa

2134921009984c342094eea7e1c8752637f39e4b28

@@ -21399,7 +21059,6 @@

2139921059989ecc240324f997d5e1789747af9053

2140021060989fa9cdd5555ea0a833e2c5f94fb5b4

214012106198a017740c918e32758d76bfb9107ad2

21402−98a21fa3375c9034ec80a0754310157c

214032106298a33f660754b552369453714ee176b1

214042106398a50af46df6629191a60801dad60a4a

214052106498a5f93aecd4ed2b77bd36706307bedb

@@ -21430,7 +21089,6 @@

214302108998d5ccc20ab779b85940fdc6d4d1a826

214312109098d71bc91ada8740c6f95e597ce1573c

214322109198d791eaf2ccaf6c262235cfa270131f

21433−98d8c4a315d60dd143003c8e4209e28c

214342109298d9819375d562e5aff3a28310ce203b

214352109398dbd5f79f4f3187b4e5723fdcbe847a

214362109498dc646fe50fa365d904b3da5ce9632e

@@ -21438,7 +21096,6 @@

214382109698e2314aedc82b248ba09e5f34bed98e

214392109798e3130acca7b432d2f1dbbd6633dc61

214402109898e7f279a2f29c974e4e0f1328b0a286

21441−98ebd9a569cabf61ab8da49f6f72c432

214422109998ec6875c25d881ed5bbb6a879376da7

214432110098f2caae06a62f193fac4fbfd57e9441

214442110198f3494373bb5c5f27ba72f516a2e840

@@ -21587,7 +21244,6 @@

21587212449a0042adb3bef413cbc61f510430d27f

21588212459a078806d0fad797d6dcf0603cbd4707

21589212469a084299cf87ae5d7388985b3bdd6231

21590−9a0928a55c4b05be864333e5e56e8e2e

21591212479a0a1a1f410604d8f4b8c024f138d170

21592212489a0b28358e1d3f0807783982aa7a3b7c

21593212499a0b8cd434bcd328fc660906b6376796

@@ -21616,7 +21272,6 @@

21616212729a2ee7f3ca47738218807d82a5be8dde

21617212739a2fae2409aa6c8227603cc8537da731

21618212749a2fb00189e84eab5b319134f18f61b0

21619−9a307dba1fe1ed7b336c031867decbb1

21620212759a31dcde5e864c7787bb61542f3e4796

21621212769a323025e305d89eb7f7c7f692bcc15d

21622212779a3299f800b6ebc2460e74a5ba53e491

@@ -21639,7 +21294,6 @@

21639212949a57d32a7c634be877e159fc78ec9fe0

21640212959a5a1b6dc3d469253ac25694413605d6

21641212969a5a305228cf789f66c0e0ed2bc3d67b

21642−9a5a9392e70bfa48b66306806293f1d3

21643212979a5cd4f3261db1dcc84295dd75a38d13

21644212989a5eaa85758ac00242d40f98b791400b

21645212999a604110af202551f31755b60fbca1ff

@@ -21670,7 +21324,6 @@

21670213249a8738f9d45279fc6c0f06e15dd31116

21671213259a879591420bd3775dea24c85a2ac67f

21672213269a8add0b5945dcece09fec916eee6a91

21673−9a948ce761b24b4ee16ac56a1a1949e6

21674213279a950a641179ff88fff59a4b6d91f048

21675213289a95935195ccf304f98559cc4b372d12

21676213299a9598aae42ae47b7653d48d6f316de8

@@ -21733,8 +21386,6 @@

21733213869b06ac784f943e6965fbb312dd5c685b

21734213879b086150b6d7d8d4c52ab13bfe64c7eb

21735213889b0a4826c0fb86294da40eb77038a3de

21736−9b0ad244f144cca9ae74eee77883fbd0

21737−9b0b20131e2d7684f3408d8101d9be86

21738213899b0b38c2fac9b9142d308bd124076a83

21739213909b0bbe3e9d21d537facdee9448a4642f

21740213919b0bd19a572d45da058f1ab843d1e54f

@@ -21801,7 +21452,6 @@

21801214529b64c0ad5cb62fc0f42e519b1c5da203

21802214539b65c07002b3fd5225cb7a6696725f20

21803214549b6642ea6631e81a4730200b1bf040ab

21804−9b675666ed680d0dafe1a9e55ca93dff

21805214559b6bfb8c67d4a2a6c0e2185ad400318a

21806214569b6db70cc4bfcf9ab45aa713258fad16

21807214579b6dd83a4787eb5fa608d580628b2aa6

@@ -21823,7 +21473,6 @@

21823214739b85fc71907a78d1e28cc7d9c6195185

21824214749b88206b84290819d9df8994e8525aaa

21825214759b888245c6602a635c577d89df5f63d6

21826−9b8c5f08ce3b46911d4e25c6ceeb2541

21827214769b8e5013ed0a3eb00ee34ffbc9d89395

21828214779b91c09cafe91467493be288ade8ed9a

21829214789b93a36769cca46210a9bcb8edacbed4

@@ -21838,7 +21487,6 @@

21838214879b9c096618636608ffbb0d893d7af5e3

21839214889b9c8c0437dace5c7e1f63a94cf11f62

21840214899b9f3d4702a291ff307d992164fec34c

21841−9b9f8a532206cf3937b03d74c2803951

21842214909b9fa53cfc4598207b83d39372c43039

21843214919ba35ea204c86c15353707ca77563e34

21844214929ba56a1ce567d3ede0e8a63ad3641762

@@ -21865,7 +21513,6 @@

21865215139bd28d6a97409f949a66895ffe8b833d

21866215149bd608a33735bb22a5bf09b244ec1d34

21867215159bda9800e66f4e3a9cb66973c769371e

21868−9bddecc39197487fe8d28a853c3075ca

21869215169bde563a514d60ea5ece05d7d628f770

21870215179bdf09aad422f983392dbe895e4c60c8

21871215189bdfa12c4b74441da0d8e50e74496e47

@@ -21878,7 +21525,6 @@

21878215259be907d1333c349d642cc853ad841d71

21879215269beb5d6c2da178aa97a73448973b5c4f

21880215279beb95336723c6b98663c26e4cc7698f

21881−9bec66a8d0298f9de34885308982b946

21882215289bf1515d303c782486ca14ebc2eadfe9

21883215299bf2ef40b22e4ea068fe2b65903f75aa

21884215309bf34dc847b4be090accf308c53a39c7

@@ -21973,7 +21619,6 @@

21973216199cbe6d605e37458214db9c220167e75d

21974216209cc003b458a8b8e2818934a349fef105

21975216219cc2f1b9b7fcd1e26b6696859f972a78

21976−9cc3ac90c9dc891fbe7c26deadbff358

21977216229cc513dcd5f39a4ac3d1b879ec4324fc

21978216239cc55e75a445837a30e19812d28f439b

21979216249cc8d9f7dc9d077b1718835957c2f8a6

@@ -22035,7 +21680,6 @@

22035216809d2a2a2c1a900ebb5795e2b8824554ac

22036216819d2dc9b135294895cbf18e5593e12b47

22037216829d2eb770acc5c5faa3eee32e7c8da74a

22038−9d3097766a6e3454a651cb4e329046ff

22039216839d30ef61feebf6415e212501fd3b8051

22040216849d31597c22b68583b5e982b415d349c0

22041216859d33a1b68323b68f950cb2b28223728d

@@ -22043,7 +21687,6 @@

22043216879d3614641bb94ebedc3ca44ff1708a6f

22044216889d3ba67014de60092c2f3786860bcc64

22045216899d3cfba4cfb1d0b1111620251f9d68e2

22046−9d3f099f43d33cff18fcab8783540f3c

22047216909d3f31bfb2a361197b2e13b616c20b42

22048216919d40846b6d94f8417df6b600fdc6eda8

22049216929d425346480c1aebd702c800051d5271

@@ -22124,7 +21767,6 @@

22124217679dd9283587b5adf91d1168bcca19bba5

22125217689dda3c336471ba35e99884b6ae2c794b

22126217699ddef2982eb977497b7138ddf2b71ed2

22127−9de0d239265bc7b1fe1b96576085021d

22128217709de1a0062bb6fd4b2e45f72417d12e56

22129217719de4979ab21a43a73ac7342f4745db90

22130217729de7983ae05884c96d807d72f1c4f275

@@ -22151,7 +21793,6 @@

22151217939e0a91f902379fd82139c7a9fee75a51

22152217949e0ad8eec4a43ebb1d5eb04e0571d726

22153217959e0bb92a61d7791ff3ae64a8159f7500

22154−9e0c52bf16e684d0cc552dc7a10fec46

22155217969e0cca5024e72d46a341e63168f290fa

22156217979e0d1e4055d68588d8eec1ef3633f25b

22157217989e0ee38ea6f5674e37b42cf41548f81f

@@ -22185,7 +21826,6 @@

22185218269e3aad39819f760fa31779908c25d11e

22186218279e3c21f1f8986e8a2a025b797dd19a85

22187218289e3d72262bf8cc77f97541926e1b5a58

22188−9e3e5b4e133500836fea21c710313a39

22189218299e404573ddbbb8c0ac88b2c7da52f1a8

22190218309e43a9f00927bea30bd780a117a17e76

22191218319e43f9d05fb38177e10edb82c1bcad5b

@@ -22206,7 +21846,6 @@

22206218469e63176e91947975378a71d1c6f566dc

22207218479e6411917539350e8afe57036814444a

22208218489e65acea6131a104f4ce2d1492551705

22209−9e65e77aef4ea9c86b27f31f1d33fbc8

22210218499e6f0cdd81a8005f60952c4d19089c57

22211218509e70e776c8df8f42af024f50b587419e

22212218519e71b16c0d9caa9ea68e1b484220ee43

@@ -22220,7 +21859,6 @@

22220218599e83164f9ab3f7d31f901e4cbcdb07bd

22221218609e896a007979c0e7ddcaca4969158f64

22222218619e89bf5e50d829c15323d4f5a4f952ed

22223−9e8b20430ca1d10fcc33c691e0d94830

22224218629e8bc9f9733dff0c40731b53ab857325

22225218639e8d46cc05bbcf298ea169f4f8db485f

22226218649e8eaee1a942c7c08d8e669df0733e57

@@ -22230,7 +21868,6 @@

22230218689e945aedf671ec4ae1f1f82f2f19ed72

22231218699e980600faee964f0b809daeddb852ef

22232218709e99070827b1225519f3b9c4364e1857

22233−9e9929d130e5fd8d9197611ebccd6af4

22234218719e9b2bffbf566ee5010a4995bfbd3ba5

22235218729e9b94fef02331f40132c12b541f5783

22236218739e9ddd94861db26d2c5a64a2db96aad5

@@ -22347,7 +21984,6 @@

22347219849f3d8dba56bdef867427c5d1e7cc626d

22348219859f3f091bf3db4181262260b9cba3a236

22349219869f3f3f2efcdbd4bd71c58505803d7820

22350−9f40a3680758cafd42c99fc4c89da896

22351219879f413eac9608562ca5bf5599882f1abd

22352219889f42db0f6f25442b3ce94b11e1277ad2

22353219899f42f2e4ce869c4f167cd990ccbee162

@@ -22495,7 +22131,6 @@ a0369f54a720a6c64cab06f671e39f85

2249522131a0393a5734d5077247868176ad0aa983

2249622132a0393a8e1bd94b49a5b04a742be0fcba

2249722133a0399b4d8eaf3dcccc996c5c6004e62c

22498−a03c44a2db95349a2162a337a1c277ab

2249922134a04085bca166150f1c20079eef68ae9c

2250022135a041c48aa554e515255c8d28f7d43991

2250122136a0435489163daca68f30b971d5580f9e

@@ -22539,7 +22174,6 @@ a095a73f4a69500247fcae9a2db8ca52

2253922174a099080acfa27a206cb2535a52e11e00

2254022175a09936d7c6fa4590cf2d7f4032023ce1

2254122176a09d8cc4521b68dded9c65969a5876fb

22542−a09e6e1e5b7f2c71f31139bf4e1e40b4

2254322177a0a0f9bbd65c868e8bd69470a2ea8445

2254422178a0a5e70cc01288bc3cb941683501b17b

2254522179a0ab163bf35f240bfdd5bacdca2a1763

@@ -22580,7 +22214,6 @@ a0e5d3291be6a0aecc64fa4d1740b9fa

2258022214a0e710f5491a92cd9bdfac9e43799419

2258122215a0eb7f77ca702bb3ae4d05b43e678e5c

2258222216a0ecf529454cda3171558468fee38f6f

22583−a0ed123ecb48b8301461717b02d0b726

2258422217a0ee0b2218b35e173a5de87920931fe1

2258522218a0ef233be498ebe3467d291ccece81f3

2258622219a0ef4e4018c123c5e2901881d48653d3

@@ -22602,12 +22235,10 @@ a0ff7be2533f54c78e67f3814671f26d

2260222235a1027a816f3d9af938b192a2a7e07881

2260322236a1033a801e0f1ae4a7c3330a3fe4c8bf

2260422237a103bdba4ea11aa9f738057f724295cd

22605−a106ab2e6ebf3c2abe105bf99423d3bb

2260622238a10987704dbb214b42c67a9ac0d9eac1

2260722239a10a02fbf914069d8976cbdfc46998f4

2260822240a10c2a76372116de1035d30f6b4d64cc

2260922241a10e41c9868ca874a31149dcbc66c9b9

22610−a110f2d0957ed4cdaeac7b81558c70f3

2261122242a111037291d55295435d9b569bef5988

2261222243a11232ac6b0d850d9adf9553c4a4f37b

2261322244a1147688cedc50bb366d2f4833d6085d

@@ -22621,7 +22252,6 @@ a11e7142b8b2eb09e09f5793466f81a5

2262122252a11e8309532499083a5443329a07d077

2262222253a11f13cb0db16cd1ba1fe2208655b366

2262322254a1232c2d54d60ba9ec2d768888b643ef

22624−a123309a557d414e980bb04b2fefdd78

2262522255a124b8c83a2c19aec0ea3c48bd57a867

2262622256a1271ac307f21e56a1aa1012dced68cc

2262722257a1272007555bf5800838148e14c61987

@@ -22650,7 +22280,6 @@ a1595359a12a89ff51ce36b5557c9e71

2265022280a15c53f51c8a5fccb39d47e6db9961de

2265122281a15e04bd26b3a85d8dc511b4b3f64a1b

2265222282a1627bc656d53060e43503cf993d1808

22653−a163383fba1daa097f0c9c913e1df5d5

2265422283a1633c0274ed56d5be01965a17b9b86d

2265522284a16675e63d2e05b28bb88efd03cbfcfa

2265622285a1689a2b819145db32d384c5f479cb03

@@ -22660,7 +22289,6 @@ a16e2baa1e3c8c1cce0c932e9433e237

2266022289a16f21ad17310b4b704ba9b51f422f06

2266122290a16f3f16d0838c1ebd000eab07874f71

2266222291a17100edd4b71bb83a7da6108dd759fb

22663−a172c579baff44c1d5a7b938bc6cfef2

2266422292a173b9a41c234bc5ed5b494fe8ad3d72

2266522293a17453413f4df5dc9e9ed72d5413a884

2266622294a1746d2d2c7170a79b268274668ecf1f

@@ -22708,7 +22336,6 @@ a1bbef8e278be6aef5bc6680b0dd10f0

2270822336a1bf596cb6d003e3850be6d9efbdbda9

2270922337a1c2561423aff7c1cd62f0bf2c0a8803

2271022338a1c28da16fde36ebc2a27a88ce1a5b82

22711−a1c460f9e47a826b1dcb2fd52389bee4

2271222339a1c48f6f27509e10318d582cbd0ea848

2271322340a1c4c89851502becffd8b733f4f05f73

2271422341a1c4e3588503477f6a712fe7bda7f849

@@ -22942,7 +22569,6 @@ a375011245d5a52cee9b3584e49c6cfd

2294222569a3762cd7d5934a6f64415a90982be20b

2294322570a3785072775184b318be65f21a4189a0

2294422571a378c3414cacad8344a152293db0c0b4

22945−a379b0b92ee844a75480c841f4cf340e

2294622572a37a784d2914eff602935ac0af278254

2294722573a37b863a5bf02d4b1c3d543d95318a6e

2294822574a37dba8255da222dd4a2ac391da05495

@@ -23114,7 +22740,6 @@ a4a14c6e4955e61ce77e6bad654ce8be

2311422740a4a4e525032bebc61bfd70c5b7eca5e1

2311522741a4a7b4e118c8f7040990c416c103be99

2311622742a4a8fc4d7adb760e2c6ba8588df713d4

23117−a4aa1f5add9f67dcf9b66c533c5151f1

2311822743a4abbfb8f16fcbd250c960ab9f657990

2311922744a4b072d4978526c6e499d5f879705c64

2312022745a4b2747d9b2857894034a3589aad575c

@@ -23144,7 +22769,6 @@ a4d0e27c6ea982b32847923c3ce6b76d

2314422769a4d26986beafe5d532dac54210501ced

2314522770a4d2aeb539941ac2915ac7e2a1320d66

2314622771a4d359adb840ad96398e7f39e823390f

23147−a4d53c1befcd246f174937cdcb93ff63

2314822772a4d58f7204d703b567390069852af237

2314922773a4d5e2d38af074e04292d17d3f56bb99

2315022774a4d73c41e13b0e61a232e31472d5f323

@@ -23256,7 +22880,6 @@ a572695dab2c78225f4ac1b89a354d5c

2325622880a5727929bfa0f2e6130ba6d1258405c5

2325722881a572ffd122780f46a2ee607c9b8730bc

2325822882a5749931e8fc371d3ef465d4e434da06

23259−a576a8ef3263e9020573562bf9d14a49

2326022883a57a0a351cdc9edf7efcbbc6d5198e5c

2326122884a57c4431b4ca3bd3c8a63b8691bd6f9f

2326222885a57d5414d6b45ce43c5f05de4a71f475

@@ -23278,7 +22901,6 @@ a5a552726577a65460e6ad950dcbfffd

2327822901a5a5d63f4013fa732a1318041521973b

2327922902a5a689cb9d9012ec9da00f00a73f3115

2328022903a5a756744c92ab61e4c325df72df5ed6

23281−a5a87953778e89bcbc4981d07f7c6329

2328222904a5a9624e2263433d2995c88c8713e7bb

2328322905a5aaee4d3a2341defc2f0ddeba6c7871

2328422906a5adfa5b769005f70f52c55dcf8e53f7

@@ -23311,7 +22933,6 @@ a5db22b1f6f1b0d031e2fb789226b5f0

2331122933a5df57edca47a1f717d8f6130a31d450

2331222934a5e542dcc14988c0d96f2b481f9d38b3

2331322935a5e9199ba6af82a26fc4e6ee51671726

23314−a5e9d92b27db72e73775af8acd89f364

2331522936a5ea19c4c52907675150d51b706e26b4

2331622937a5ea1a4e59d06e745772bddb404dca33

2331722938a5eb6cd40310afdd796bfc8fb35c88a4

@@ -23447,13 +23068,11 @@ a6c7d0dbe9d7445a9ce19fde1c0a88e5

2344723068a6c958b2aed9b2153bf9cf9caf3d64b2

2344823069a6caf8c60bda1a560e15bfa202702cd3

2344923070a6cb0f8b0a49ee1544d7d18a641bf910

23450−a6cd3e4cceb1483a3bc2db2c73c6aba9

2345123071a6d44604e86a19997282f5deacb3dd3f

2345223072a6d522a9f5c300e3be7c5eaf19a4ab00

2345323073a6d5d2ca27de290fb13dd7d9ca10336c

2345423074a6d5f08b9bc5daaa1335c99380c84d54

2345523075a6da2bf9a4385437c0579f3952d36c27

23456−a6daa4f8838cb7946e335b639b23b6dd

2345723076a6dbb0ca18539cd62021c1bbf9d134a7

2345823077a6dbd30c1deed7bd726bdbc4013c67a5

2345923078a6de8a765cdf65b9711b4e546c34b365

@@ -23557,7 +23176,6 @@ a76b32c5f4b05a8353468f20c9a7cb6f

2355723176a76f6802f3e4bbf5ae9d8fb6d3c39c7a

2355823177a76f71009c980003eea2062414ea11b3

2355923178a7742a668365d60c9a44495a4329e3dc

23560−a77445b146425d6f1376a0dcce77ae6b

2356123179a7748015c29aea4bd98eaedc2a8be721

2356223180a7786698b995f1d3e19823a834537dd4

2356323181a77af7c1e34d19ec3e9c080bba9dfb05

@@ -23795,7 +23413,6 @@ a94397f704e7d51ae3e62517f2f4d440

2379523413a94ad86cc3f8fa1fb816faab4abfb90b

2379623414a94cad56c41823b484321acee181224e

2379723415a94d6e304f24d1e7d7cc7d07e32c2f72

23798−a9506d330520c8f0b9137cf5627ffe8f

2379923416a9509a7bd9bd790eea584df6613c4e15

2380023417a9512d54de43b1e1157a5de637db8e33

2380123418a9514ca80c7067426d808e7d6ccc4298

@@ -23859,7 +23476,6 @@ a9be1a5f5bd1897e65d513a39f1a0fff

2385923476a9bf3b9ac11fc355efa9da970186f927

2386023477a9c0a6bc0e3dbc9363cdc323b5d4e71b

2386123478a9c15ca6aca2c390ab605509a6f32b24

23862−a9c506cf4bf7c97fe61d7af25cf34c88

2386323479a9ced68ed00774ab8fb76fca3c8bb21a

2386423480a9d57efd56642588b2681f19791391a0

2386523481a9d5d4c80e48f641abd126b104a4b401

@@ -24059,7 +23675,6 @@ ab5b65d14f3dc86cef65a528a62c946a

2405923675ab5e91739495a4529085b93df631a1d0

2406023676ab5e9c458c8c8a0b069c01aba540181c

2406123677ab5f0a63b94cda6c90a0615c6c24782d

24062−ab60f63c792d6507ea43bdc0adea3101

2406323678ab62f8f380ecd91b11c588d7f58a1e5f

2406423679ab6602f682faafb05ad3793808afb478

2406523680ab6aa5c71870daa409f2c72777b9e11e

@@ -24106,10 +23721,8 @@ aba913bf8fecb68046821b21d32a753f

2410623721aba947b0945cf24cff8fa86a03dfe139

2410723722abaa709b6fce84b4d35eb41e9a0bae65

2410823723abab31c3f484c8cc553ca98449f96961

24109−abaf519b0c3c95f5f75fed1f9795b8b1

2411023724abb0ffd13a6155c03bdd0b852640f81a

2411123725abb142234163d8b88cec2476bc4751cf

24112−abb2c76617a43c0872d45ec706ab199e

2411323726abb3839f46fbbb92ab027845f624456c

2411423727abb75a46a7fb855f41f5f2b2ef1b13a2

2411523728abb8e5b549fafb761720412b838b6e2b

@@ -24150,7 +23763,6 @@ abfb1b003444b6847597514e1e6701aa

2415023763abfbd98afd86ec64208305d01a12605d

2415123764abfe2315aa7a806dc0ad2e43f12dadc6

2415223765ac02fe3164ed4066842e0dfd0984a7fe

24153−ac04012918c454a69b09c37d791dbd1b

2415423766ac046e469f522769c052770e8e406c5c

2415523767ac120991de3bb7a21613775c669a40a4

2415623768ac12c5a936da317bbe80a11a1712d8c6

@@ -24248,7 +23860,6 @@ acca8136fe0a889da46d6da12b2c6996

2424823860acce4d5a212b261cbb7c26d61f45675b

2424923861acd004085ea907d706c6bb1d1c00ce09

2425023862acd2b22a2b7ba474152a566cdfdac161

24251−acd55db4868a01e3d94f97c10823e380

2425223863acd5c30a88089b16ecbd91471eb4c4f0

2425323864acd9765b5228e5a68c82362e61df7961

2425423865acd984510ecdf5461c112a3c0b2c875a

@@ -24261,7 +23872,6 @@ acdd10d2c5003f10146e468aa03beb2f

2426123872acdedbe878e59413ded26c0fd1599393

2426223873ace19407f8860caa886d21086866a44a

2426323874ace967816af932910830304d303cfecc

24264−acead24c704eb51f67ea479d1074bc0d

2426523875aceb9cc5f25dee4a54201e6201636aee

2426623876aced7b36912517b925c393c5e2d0a55f

2426723877acee102fa8ebde418e8777b9cfe583f9

@@ -24374,8 +23984,6 @@ adb0811fc6cba841637d7fbcc8522984

2437423984adb10258e94823bbabbc0000058ce236

2437523985adb19a03e33381c596a46ed1eb573972

2437623986adb6370ddf7a93a90a75a6d59dd9ccc7

24377−adbd42b12d1809e7a6530041ff6ebf3b

24378−adbefa5a0455aba391fe8b6e41d10075

2437923987adc06a24ec0eeceb296fe9eb91421971

2438023988adc1974be058cfdc05e71baf2015b211

2438123989adc460f797783f5377c8d54d19d76170

@@ -24610,7 +24218,6 @@ af4ca8db70e2b39f356221bdcaa07602

2461024218af50b4f884299f60ad5f5b70183ba1c2

2461124219af53307aa3a3dd5e940b08ec5d8e0c39

2461224220af541a245bc254a79bbedbadc52ae732

24613−af56971fb1e394b06d8e071d4ce2f93c

2461424221af59039f7fd030221accf7065d289c8f

2461524222af5a49d34932d2c221fbc4ca6883cb56

2461624223af5c97c9ad40069de547879cc34d371f

@@ -24798,7 +24405,6 @@ b0a8e6f685eaa127be7efa3a093cd20e

2479824405b0ab76af879d8c92086d960b476342f1

2479924406b0ab8fd0edc0fd8b8b6da25ec6f4880f

2480024407b0af8a15da5d662d4900dce3379a5191

24801−b0b0c709f8a52d22f780261939df1b0e

2480224408b0b190fb0f52ed04bbf8014537f43669

2480324409b0b300a8a40fd2d9dc39f3149b0feccc

2480424410b0b5c27126d91e21ed0937da6839f2f6

@@ -24833,7 +24439,6 @@ b0e21c27cb43325f0d2e4b68774c9e29

2483324439b0e47d951f8fc90e72982bd82fb825f1

2483424440b0e580283d40bc2cddc96bdee652d456

2483524441b0e62eadc8fff702de36db462f916158

24836−b0e77801ffc758af791e612e4ea6bb7b

2483724442b0e847cdb66477587a793cae3a50849c

2483824443b0ea259c8c9c2bdccdad7c045a2dfe48

2483924444b0ec0ff1fb581f89ed2409ff6f09a14c

@@ -24877,7 +24482,6 @@ b12cfdaed7541d7557cc60af068ace97

2487724482b13097efdf6a87fbb494aa7e212e4f71

2487824483b131041da698d9df6eb243d147e25aaf

2487924484b131c13318299709402bc08df954e568

24880−b1349eb094b84c14f892679a7581fbcb

2488124485b1369900c235d99f3c57dd84ee394933

2488224486b13944daefefe8f1cb4e087700f17654

2488324487b13bf725a8e2bfa89664b22b4529f1fd

@@ -24889,7 +24493,6 @@ b14bf89192bc622c4d2cf83939e0b487

2488924493b14c1f25953e74790bfb7979fec8c7ea

2489024494b15061937d59e6e102203c896ddfe95d

2489124495b1507baead651d7e9e0c95eae3cd7063

24892−b15210d0eff633e3b526f1db2b4ebf55

2489324496b1569410b74419dfb0f7020e98f60eb1

2489424497b157b93be085c79207c9422cb7e9e33d

2489524498b15913f1f5f5211b28622d9dabd2e7ee

@@ -24910,7 +24513,6 @@ b16f48be60f8969b93bc85f966ab9b86

2491024513b17207c63ccf0bfdbd655ef3ec5dd384

2491124514b17541fe46aeb075ee59e3a8da16edb7

2491224515b17778b3af0c4713b713d54972898a6a

24913−b17912a3ce4ea0b7222e4739909f1416

2491424516b17994e00ead525d7b5e9cd70c2c70e5

2491524517b17a84254b6354f6dfa2a17a1e844b3f

2491624518b17e33d2688e58b9b1b7f1426c4dc1aa

@@ -24919,14 +24521,12 @@ b183c425efc80d455e4b166d0a95bbdb

2491924521b18458f81a7548a99dc34f7edb25ad16

2492024522b187ff8c3fedb0480c850f8679a3eba5

2492124523b18d9ad11c1c77784214a5725b080e81

24922−b18ffd3abcf540e493835984088d53e9

2492324524b1907f4a203ef7a3b1743931cd6e0ff0

2492424525b193e2f5debab5c5c9ee7f313a7dee36

2492524526b19996ab23c7493987fb14d8ac110be2

2492624527b19f22462e4cb12bf3a78156b03f3404

2492724528b19f31da27578b77e120124b7e91b8c7

2492824529b19fb628ff498ad6da4faca70400dfcd

24929−b19fbe6f338d3555a96101a62b1f9957

2493024530b1a0f1711497c6f16d3e1c816aeddb4e

2493124531b1a17f9fe0410979bceb956c8d0a9a1b

2493224532b1a1b455b5f123afcb78ce1e221d4850

@@ -25175,7 +24775,6 @@ b36175d75bd798e1350318a1dd650edc

2517524775b3623ebd31ba11756f291efcbbc93d52

2517624776b36281d2b360281f9cfdf2db1d18d4ca

2517724777b368c6a80d83570d679da36d388efe66

25178−b369353de54c8384a2292eff88082896

2517924778b36d96665f578ca728f63710668f6b11

2518024779b36e201727bcaa234ecb197268095eb0

2518124780b3722224819f809b0a1c8d1f4a553b4c

@@ -25433,7 +25032,6 @@ b53af65fb58e9698c0c1a021fe2f38fa

2543325032b53e512da982d82228fce6750accd1a5

2543425033b53ea43d620030598e04382e43097884

2543525034b54066805bdda8385012588de1ea69ce

25436−b54122c6f75a5a75ae6a132f96faac3d

2543725035b541299b3475aea916457a4737516764

2543825036b54741350766dd015e188686bb15c3f1

2543925037b5475faeac6ae602fbe1a7f7cf3d734b

@@ -25491,7 +25089,6 @@ b5a0fc784279541f81d64b28ae984dc4

2549125089b5a23560615c3dfa170a60c8393e0763

2549225090b5a301d559d88ab3e9d99635df8254aa

2549325091b5a32260676a51bb1b1ea7afa30c8c51

25494−b5a51737e16706798f7e2961367470e8

2549525092b5a697cbb509c9cc3f3a72ef4e2d8677

2549625093b5a80ffb00e8896d5b1dc00bb3bce5c7

2549725094b5aa91ea815222b8adc599056f83ea49

@@ -25571,7 +25168,6 @@ b6359af231a49ca2c91480a467676d39

2557125168b639495358d62618ef62404e0840a60b

2557225169b63ac2446b5f65b7b171d7ba476972dc

2557325170b63bce1c9631f2e187211de76797daa2

25574−b63c0f8798d85e7c4be6e2bab0e4900c

2557525171b63ca466a47b2cd45b53a1fb5925d1b9

2557625172b63eb537755ab7e921bc567ca40313a4

2557725173b640de0c79fd8029d34583137c6c65d0

@@ -25579,7 +25175,6 @@ b6427c3c35f9a81d84ac094d331f236d

2557925175b642849fe4b52121fa2786c10f4ba356

2558025176b6434086459942467e936baf3710fc99

2558125177b644133f996054b26834c5501d5b12eb

25582−b6441f34dbe606e5944fcc8605ec53a1

2558325178b644dcbc7cd56912173df423e946aa07

2558425179b64802fb6ef38a675aeef3ebe9d4862a

2558525180b6495a62eb76e9b0fa16fdded0078bd7

@@ -25644,14 +25239,12 @@ b6a24066052492135599082429156ae8

2564425239b6a307ce5bd2b3274d7f33c628d1c29f

2564525240b6a6ca5da9a2e81772ea87d03b604d31

2564625241b6aa395bccfb94cd8e401989eb14f811

25647−b6ac61f5391721ae41083df355ce6194

2564825242b6ac99bdd024f2a97c418d150ac11d0a

2564925243b6adf73bb44363514ff04f3696593992

2565025244b6afda3dfd18e00aadc1f9919f268538

2565125245b6aff606bce405cfeda5832fc2ffb995

2565225246b6b151f4b26ae1342debcd6c6582dc32

2565325247b6b1f612e33825d437b4bd36c744ef8f

25654−b6b3cec946778923c0d52ccb46e932fd

2565525248b6b421993991371efaecaf33d40302b5

2565625249b6b4546a45481a4e896745d3b51ff359

2565725250b6b94610c6637ffebba711252719f0f6

@@ -25757,7 +25350,6 @@ b7590b83b54c4963ae2d3ff8f74e9bbc

2575725350b75b1b3cfde8f1f61c356312726d3c04

2575825351b75d058dba8ff1c6f8a0449754330a77

2575925352b76312fa0457c1f5fe83aec9371c299c

25760−b764caa4ce0f75646c3d0aa26ec1b3ba

2576125353b765ea251f92805a6487dd226e6b9453

2576225354b76617223a4efbde6e2f590df7e87b26

2576325355b768001e49b90a090d81851045a96aa6

@@ -25948,7 +25540,6 @@ b8ae1bebd23317456611d102eb25688b

2594825540b8b6396c5e12dc79c3b36b7c46bf8751

2594925541b8b886a881c069430c3595ff35b4cee5

2595025542b8bae3af2af4b35644fa5ed295a055d9

25951−b8bc594c50a06066b2e7042c3915e325

2595225543b8bcc42578b54f5b4cacb02e837647d9

2595325544b8bf24473f17b3e835f604da1e9b0b3c

2595425545b8bf3c2dedce91e8d81e0a7f581a207b

@@ -26006,7 +25597,6 @@ b918183e0a3e6bbc7ceb98d545d9bcb8

2600625597b9199cc12acaf8e032054ff607c83fd8

2600725598b919a4737753232797bdf717ea2a3db2

2600825599b919a7b575c43451b2e92732eca6ded9

26009−b91a2ae3ced4f098684ff3b9b0c6c592

2601025600b91adf5d142208c65cac8a57b153f712

2601125601b91b0eb468c2b82913ed45e02fff8bc8

2601225602b91c0a842938aeeb36ba37bf90dc2578

@@ -26052,7 +25642,6 @@ b96b6b5bf2f170560895d232279a6ead

2605225642b96e3d0d231d0d1091ea3ef7e746dd89

2605325643b9718e01ec2c7e04f188c59a44e0b856

2605425644b972afc586c924a88a7ccee4465046d5

26055−b97720f039a2eb99ce6ef2666c8290f7

2605625645b9785e6b87f36e1e5527ea8d7af8c709

2605725646b980bc08567b376b088ec5ca1e3e7d98

2605825647b980ffd694ebdd242391d014a323115b

@@ -26080,13 +25669,11 @@ b9aad97e50c4bd33094ea141c872b3a6

2608025669b9ab8b3c4528627516a135562a54705b

2608125670b9abce049d7d18d85feb8b3a49bfabd9

2608225671b9ac970cca94f1038bcad3629b3ec807

26083−b9aeb6a8fafb197daf63019a29e50aab

2608425672b9b09c941593363c5b1135189f5ce397

2608525673b9b0a192fca915c7b5a41be84fd59618

2608625674b9b2e1b440d0923ce5abec20ad6d02d6

2608725675b9b5087eed07e760ec53571fb354ab2f

2608825676b9b56f8b413caa5a0154f0a7447ccfb6

26089−b9b5b2f41b355b7fe75fb5497046b170

2609025677b9bf26088d3e4608646a6e32fec37efb

2609125678b9c0653f025eb7bf4a47d77b7eae6fae

2609225679b9cc3ac275011aa259b067fcdf315fbf

@@ -26157,7 +25744,6 @@ ba5c2279911a0418e970059a88414b08

2615725744ba5cd9c8c6d317459f53456ce51d63b3

2615825745ba5deda920d853a4324c6ac53215f19b

2615925746ba5e6da597b8fdf217eb3dd87d997732

26160−ba5e842e5d19ca31b0cbe1ed478d1742

2616125747ba6347d7b787812fb521bc2b0d66ca96

2616225748ba63927fa4012bf39dba71a4e9e1873c

2616325749ba64af3bb24b42b0a072f1bcd3bdd262

@@ -26174,12 +25760,10 @@ ba72a15bccfe4cbac687b82dcfa49d2e

2617425760ba7385ed2c40a618cd024b14668d71d8

2617525761ba77188888946b768099e57ec025a61b

2617625762ba78b4f758112e2defae1a3475586a83

26177−ba798215fed31ec3da482a91de1b3445

2617825763ba79a6caffc5117e8f3196eb7ff48ef7

2617925764ba7cd5e3561851d5bd4f7b60eed78d80

2618025765ba7d8efe795c88bd955de995665044ce

2618125766ba830176431acd854dfffe086756f04f

26182−ba84935c099b0b8610ccd5223d44bd8a

2618325767ba88ee111a06f38d13765e4e0196f7f7

2618425768ba8b9de5cc84cdfdbdddd4907130c655

2618525769ba8d0b8ca6a227b5cc6dbfb749628917

@@ -26193,7 +25777,6 @@ ba94b07bff40e5ef853b8312c29713ff

2619325777ba94eb4b3cddd0c5babc30462c30ae09

2619425778ba95e61448ffd2c4e24834417c7aa19c

2619525779ba967a191b7a5fd744a0179a3d3c5ce0

26196−ba97984f8662d263e29bf20cc6a91062

2619725780ba9832331311e6da4c795935deb9f235

2619825781ba994c9097fc8a993d9e60f0e3ee7f6c

2619925782ba9bd68859306e301053a875a4e722c2

@@ -26227,7 +25810,6 @@ bad37e9555a12869ba9648751569dc71

2622725810bad37fc4e2ff156c8fe4e64cd6fb1f3b

2622825811bad4b94cdb76a98934ddf561ddc801f3

2622925812bad643cdc23d2244413db278e8214490

26230−bad674f6c6c2e4703ce2a63d37d2124c

2623125813bad7d1725713015c7dfdf110e0a19851

2623225814bad907a546dc22ac816f8ab29c1b6742

2623325815badb89863438fb6dc644b66cacd12cdb

@@ -26362,7 +25944,6 @@ bbceb443078694c4d171ee5939545662

2636225944bbcf08fd98935328c7ad792cce85534d

2636325945bbd3e91cb991018db086e2a90985d642

2636425946bbd4a4560f6c6b1a9127df10936ecc48

26365−bbd4f0a69a9ffde189961dcaae055254

2636625947bbd4fe98ffdf5e6dfcdd92b9e65ace91

2636725948bbd6952420f5b934c2bb47e7a688b218

2636825949bbd82df26dddb2296c299db2eb827823

@@ -26455,7 +26036,6 @@ bc7d388307b72cca066ca8ef7f4c5215

2645526036bc7de8289d0c441f8512059c671a2d20

2645626037bc7f210eecfa5304719f334104219fb1

2645726038bc81074749b22fc9e674d414c6b2ab98

26458−bc84b645b9c5f780952a143d8b3f2cab

2645926039bc86ed66bc30df225b248e040881c26c

2646026040bc89a835e2e9d17e74862862bfaebac2

2646126041bc8c59d679de2e0ce93594f669bc6c38

@@ -26469,13 +26049,11 @@ bc925aec35475c1ccb1618f5740d5050

2646926049bc936b40362217cd3b9c0dc581378390

2647026050bc9500551e8b9bb28f082db5df179777

2647126051bc969fcabd8efa5607d0a9f2c47b6c04

26472−bc98ca57d780ef724fe4423d47b9b8c3

2647326052bc98fb9045921d5bc386d5decbb32e4e

2647426053bc9c5594b18de4f32ec8a34fea01d7f5

2647526054bca14e10c3ec8953d50795b1b648977f

2647626055bca197e88d3bf54377f7eb87c5892a54

2647726056bca2317c77203b46a4300cc546df1429

26478−bca54e30e670df638ac255e4adf06298

2647926057bca5b87ea0d3c9e05df01e2c8e260742

2648026058bca5dfaf72454538e9544d8198fe54b2

2648126059bca64765d9c5f2c085daf06745b30a9a

@@ -26562,7 +26140,6 @@ bd4f7c2003995dd2cd1312be72043cce

2656226140bd551c12756021127a407aee4bd3cd29

2656326141bd5a74a0d6404418dfae506c23ebc503

2656426142bd5a8d066af5d4644b56f3b66b5d356a

26565−bd5f62341cc8c90a1f306ae48c29bed8

2656626143bd6332b651affb13fb35aab3d36dd792

2656726144bd6579e86fd01aa8a2afe0bb51532bdd

2656826145bd69cd548744290fcc7640f23d4f65bd

@@ -26571,7 +26148,6 @@ bd6ffc7a7ba01a3954f2634f666d14a6

2657126148bd724de3271ead67f90481d23db3c28c

2657226149bd77107c575b25a8cd1ce223a9696b81

2657326150bd791e179bf92c897d127d8e6a34df8f

26574−bd7dd69ff50d63a8e61371bc9da859a0

2657526151bd7e5eb7babd048aeff454a0abec82ac

2657626152bd7ea1e13b204040a85e59c6fe51a77f

2657726153bd81404ec71d476561022fd4cce0abb4

@@ -26585,8 +26161,6 @@ bd966a8c450834f935e0df5143b5d67f

2658526161bd96cd1b00a05c61b1e89fffff02f929

2658626162bd98a1946fc6a3d1bdc7bd7cd3a69a8b

2658726163bda3ae6ea7c56b9a2fd986b70a6765eb

26588−bda402ecdac7e8236fee90c9f2d14c11

26589−bda7cfe66b25e77c65086a6228851729

2659026164bda9c170ed50bc53f3ffa6b26433987d

2659126165bdaba093d97efaace135a7ab9b526b8e

2659226166bdac2479036f418d868362a80191ee93

@@ -26709,7 +26283,6 @@ be93f40f7574e8245fb5f9b2bdc8c81b

2670926283be95988b30e1af7749aefb285355f6f7

2671026284be96bcd53dd56deef7e2f135751a8f23

2671126285be972fd73b8f9e1576e8cf0aecc6e1d7

26712−be9752dfa76e085f08dab00bf50727c7

2671326286be996b52f43f196670283792a187aa7f

2671426287be9a657d7657cbf881a6df011db1bfff

2671526288be9b193ce9e1ce4144f2a43ddca30583

@@ -26723,7 +26296,6 @@ bea8bf4556b66e3f51a60259a678b4f5

2672326296beacd19be8a4204b1f3f00dcbdebdb4c

2672426297beacfa933aec442e6ca101ff121e9b11

2672526298beb11e53b22aef05ccc2f9551aa5abca

26726−beb2ad2de0dc556a0597e18c1a45cc24

2672726299beb2be0f952b3401c5ac5b665fae58b1

2672826300beb382e95c1aeb6034b052e8dc59330e

2672926301beb3f44ceb81ba65614c2da119fc52db

@@ -26753,7 +26325,6 @@ bedb5b68f14c87de2ebb1431e262ad39

2675326325bedc132473ad752234713ba7832413a5

2675426326bedea6fd3003e973ccebb4c97d1d41a2

2675526327bedeed4e14ca890c56aebc320976f00d

26756−bee058a1d05ca9051671629ce34aebb5

2675726328bee3d90a904c23e75be2db1a312d2f09

2675826329bee3e2ff08e342fa882ed8bb53e7f62c

2675926330bee5a1cbda3e995890e7892259ea5d16

@@ -26808,7 +26379,6 @@ bf37d41cee19dc03a51565d81de620e7

2680826379bf3a10b34d0edaa8ee34b5fc49dd81bb

2680926380bf3ab1dbb24ad358e5fec2a07b452e2a

2681026381bf3d06dd2467fac353d4543864e362fc

26811−bf3f011938560d00adef55becf2581bf

2681226382bf406688150e523c03aaaa0558ee0f7d

2681326383bf41ce2f9e20b93e11f85ef75b04c1af

2681426384bf42d9affd3357ef148d89405ea8acdb

@@ -27022,7 +26592,6 @@ c0bc9f5044c19090e7251d262f25d49a

2702226592c0c4ce6586b1b8a695601c3f3c906c9f

2702326593c0c6018aeac5d6d280f35dc72b3a2be7

2702426594c0c7e59b0e8b45de7aa5e074910890f5

27025−c0c9b2a00cabe2344537cf62f6054edd

2702626595c0cdf4eb3247445da434120a630e1c0c

2702726596c0cf1f91797f5702030d520d17249b7d

2702826597c0cf3c9adae08bcbfc097f0f4acc4291

@@ -27195,7 +26764,6 @@ c1e76ea8839b654fbd04621cb7cf355c

2719526764c1e8749bc810648e8295d6fc68c888d3

2719626765c1e8b8bdede711b8ac62cd5368486d47

2719726766c1ee4d310780d3c9f36b8a54df4175d0

27198−c1f2156a717ada3d4bf786aba0f1ae96

2719926767c1f36e57f5a282814b36b7469ec66736

2720026768c1f6f033fae021fb5595619ad3f2d3ec

2720126769c1fa098c5de27b840b850e107f5a6590

@@ -27205,7 +26773,6 @@ c1fde5bff477c7667250e8aa1e938bf1

2720526773c1ff557c21bf14efb3fd2d9bf727329c

2720626774c1ffeeb374312f4dcdc3ac211d017805

2720726775c201021b9ba276fdf4a5f4ab4db50720

27208−c203a7b62434370b076eb552aa3ece35

2720926776c20789a206af5f045647b2175ac72ccc

2721026777c208199fef03e5d6d9127296094252dc

2721126778c20b070e0ed2149b0430adf6db0055bc

@@ -27215,7 +26782,6 @@ c20f58e2e2e9b45d297c61315a9bc914

2721526782c20fedc45c15b0b06593e0c3805f8c80

2721626783c2114e6ca8080743ca7a6ae466cd77fc

2721726784c213bf87398b1542499482fc56f0b835

27218−c21a0a75c654cd6b2d2002d5e4d2538c

2721926785c21d830da08ff1ddf98dece11c535b91

2722026786c21ee42a4157974ae225a36d4bdfa701

2722126787c220a5591fc61cb11feaf0bea96189c6

@@ -27343,7 +26909,6 @@ c2f5d0b96f8da04c256d5841e326e056

2734326909c2f6c6b4aa1152a5fbd0107ce9e7572b

2734426910c2f73c332698ef87c8ee398f5860746e

2734526911c2f81ddfdfa2b32e60499cee2adea05a

27346−c2f88ca070b6e22fe7e87c39b0b01494

2734726912c2fa2cb00ba0612c1c6d88649568a810

2734826913c2fa553841690d8991bda5f34f9f0dce

2734926914c2fbf4fd75dbc170de09a47fe3f07682

@@ -27364,7 +26929,6 @@ c30ecf6950a0087dd7acf7400186af65

2736426929c30f0b1f6beecc3647f7754fd4bc68f8

2736526930c30f2dd44c23502cf3d5d1b3e0f05ac2

2736626931c30f7119992d04e7952d3f0068ce1bb6

27367−c310ca61b5b3a13770746e0e305ffcb5

2736826932c31209044613a8b9a77e456825cd01fe

2736926933c31324846d27346c8d9d5eb54373141d

2737026934c31696f5c54f9953738e8ba5c21c3840

@@ -27373,7 +26937,6 @@ c31932bc11f0b29056eaa6e108440f1d

2737326937c31ab7590b7a627b74e3c20f718f912e

2737426938c31bf090dc65b81c5e0a13c28b7d6a9f

2737526939c31c092d0ab0c98e985913f36d651c71

27376−c31c695963f8854327ac30f6201ecbe6

2737726940c321341a0ed065d09d3f71bbffbf6efc

2737826941c3245a801e35b35d9880cf424c6d4c1d

2737926942c32aaa08b87ef90823e6cf7f761f1f1b

@@ -27407,7 +26970,6 @@ c355afef105d21178db3a66f35163fd8

2740726970c359755e89002d8bb3f14da9a8d8639d

2740826971c35ab5ae0a6f9d64176b5b97ec2d54a8

2740926972c35e69238ff278f304521307fc140d94

27410−c361b1c6600a744fe66f12875567072f

2741126973c362a5f720be9a5eff0dc6783a41a81f

2741226974c362ef7a2b2f4d9206332e481c67a5d5

2741326975c365b0dd2879e5b9d522244ff93a32df

@@ -27446,7 +27008,6 @@ c39bbbd8de996eefe8478fb287645487

2744627008c39dcca688a1b04556fa8e9205bb5512

2744727009c39deb75a287d07e6be6e666f87735c4

2744827010c39eddb90dbe2d3115da7bcc01262b05

27449−c39eefe8b60e9e517901f99e87855216

2745027011c39f911754be809ba20f47f6f9bd93b3

2745127012c3a0a78457d7a0bb62806cbe84fbfd6e

2745227013c3a3e062001ec4fd9a42f35feb37df54

@@ -27500,7 +27061,6 @@ c402703b89badac9661b1ac809ec6e6b

2750027061c4027c1087a59d993c95577a1837a6ca

2750127062c402875e8ca8e15fa4f9531e734d59b2

2750227063c4048a86c39b8fd78db54e2d3c659eba

27503−c405a0802efb4a79ad3c2e9cb1111940

2750427064c407894aedbc818ec260404f312cc21f

2750527065c408a4fc231784912266b7084199d0c9

2750627066c40c607c2816f152b40032cebf0f9c03

@@ -27509,7 +27069,6 @@ c411bc157437c6a7a1d6a648848de3b9

2750927069c4139f13156a2203900fd92ca1545c64

2751027070c4156f42875f915253ea7e9902de1229

2751127071c416d791a255c0d285b21dcc7cde1e09

27512−c4173bd88ab7f4f52e77111d4752fb60

2751327072c417eb363c5902819ec10e2d492d6be8

2751427073c4199c0de57911950812db778fc996e9

2751527074c41d9e55ecc837cc7f1a517a1f414c25

@@ -27531,7 +27090,6 @@ c433109a0181a72e8e35f6c85da3011b

2753127090c436056ef9aa202808f15b0a3ff5ef86

2753227091c4385ed5e69f2cf5ea4a4d537114d857

2753327092c43ae0db82d0f680f78ae66cbfcc813f

27534−c43d95f0d9970cfc109172280b306318

2753527093c43da58814eb7b4735a30db1540422a2

2753627094c43dbf57bece6961279815db75b61c3f

2753727095c43dd5845458724dd27d46dc6136de5d

@@ -27697,7 +27255,6 @@ c59039c140764053dc091ebaa959c61e

2769727255c5913891a163b9944264997f6bcdafe7

2769827256c596a1507a56c03913dbb44c45cca681

2769927257c59c40f137ccbee7826475a8163e893f

27700−c59dbf6f49807ecf10a15ef8d88254bc

2770127258c59e524a61b1efaa09ea2f7498517b17

2770227259c59e92f4f3ba8284c18e0e3439562318

2770327260c5a0cb55a624dc3838f375edb4e205ca

@@ -27850,7 +27407,6 @@ c6ab544c8df8fc2988704ead969c64b2

2785027407c6af7ee85a28cc2f91747411c0126fbe

2785127408c6af9f211e198a0594b39b0f8e732e53

2785227409c6afc912c6326e5378e94b85b4edff7d

27853−c6afdd7e567e1fa4cb8f5028d0015175

2785427410c6b1001b750a6b10825f4494d3c4678a

2785527411c6b2806de12a5a66cc5376e988ca0dab

2785627412c6b726a22678ad1d237859f327444e48

@@ -28035,7 +27591,6 @@ c7fb1690f1c352686153580261e7f49b

2803527591c7fcbaabfb28d769c6f67d749ad3d24a

2803627592c7fdc0a95c04d600accba09aae2e3a9d

2803727593c7ff540959cb65bcfd86dbb7feb4f240

28038−c7fff82a77da14caaa8d3543de7e5ce0

2803927594c8010f1f6d8912fecba617d37e6cb05d

2804027595c802aab557ea92a92bf03a1450c89110

2804127596c804baeb5bc541ba5d328ae35f0a8125

@@ -28152,7 +27707,6 @@ c8ae64f77d055c29af04d1b99879ea19

2815227707c8b0f12e343b3b0ae763153527a0220d

2815327708c8b121246b1ed67c4a2b72e6d222772c

2815427709c8b26ae0bb0bbb55e52464e10da9fdfc

28155−c8b35d72c0b821627d28ddda166abc05

2815627710c8b4a5d5bf07af6f91e35a5f555a2309

2815727711c8b4b8e5b7dffba06ea08095a51e4044

2815827712c8b630467dd2390827a24416f410e49b

@@ -28310,7 +27864,6 @@ c9ae773056f7d370502fddfa70488977

2831027864c9afc919e0d692ee80d23e1e109779e7

2831127865c9b16953a3189f9f0f94b4b3052ba4b4

2831227866c9b17506d16defebe23ce186bf84df38

28313−c9b77d033120de872dbe1b0ad9cbf8ad

2831427867c9bd62feed525fd2cad60dfcd5bb934b

2831527868c9c19d484b2b0b92b1d3b6ccfedea94f

2831627869c9c4575da1d1db0c8e5e38a3bde2a3e0

@@ -28348,7 +27901,6 @@ ca09bdc976b58c7172b4bd278f307a50

2834827901ca09db494d5b2eb2deb5e0b2fc87bac4

2834927902ca09e4dad6e596254546de26f20e1fca

2835027903ca0bf022fae68e60549b97a4943051a3

28351−ca0e0c30efce45e612eb80da9ae74f19

2835227904ca0f87ae2740a4ea6f62e2730a90e89a

2835327905ca1263d2d9f282063468dcf6520dfac6

2835427906ca1495863fd5c4483090e4ff8dabaa65

@@ -28410,7 +27962,6 @@ ca6d62ea11f510fe8ba7bf4a918ee2b8

2841027962ca72e3a911b80c1293e33153b3e1d9d2

2841127963ca7352bc912e43ab83080131dad9fee8

2841227964ca73a7a2b21cfd0acf0226ca3543a942

28413−ca73efce30c26a91180764783e4c25d3

2841427965ca74e273fac6008b049087184be71692

2841527966ca74f3dc84e82d3a075a076e4eafda42

2841627967ca77ac1976311f268779d82bc631a748

@@ -28454,7 +28005,6 @@ cabab3f1f25bd18233ca539c79494053

2845428005cabb605c84243d9af7bafe92dc4718c6

2845528006cac0c7f789663104136570c58bba40ce

2845628007cac11864024754fd487eab172bfd1be7

28457−cac28534f5b64eba84ddfc8805103f3e

2845828008cac7bcb09a2f531e71db07f658fcc220

2845928009cac8763a1f869d93dbed568a4369da46

2846028010cac8d299e75c9a1be83d277ded994a51

@@ -28464,7 +28014,6 @@ cacb31845dc328fcdc12aedaed98ee57

2846428014cacbfa9861bc169c12100837b60e4a22

2846528015caccb4553bea14b850173ed929d48427

2846628016cacea158c089d6f047298ce91ceb6778

28467−cacedca97c4979067966a58cb2fd45d4

2846828017cad0cd81ed3e0c3d103ec9833a6e7bfc

2846928018cad54c41579530a07127f1dc317d8f54

2847028019cad76650641ef43923d50e791f696de3

@@ -28543,12 +28092,10 @@ cb6dff36fc820b2d14256de9acdcde80

2854328092cb71cce2c6007925111bcd1d97630520

2854428093cb7314cf34bc73e19f52a34c06997059

2854528094cb7475a883d17e1d52e39769fc8897b3

28546−cb78a60b0368045c5c2bf05cbb678539

2854728095cb7c0180fa8520c6a8ac2cf2c44900c4

2854828096cb7cb819b971c81380255caa55a3e3d4

2854928097cb7e174c0da2807c5d07cb83259b27f2

2855028098cb7e38eaa7cbbb3eb4fb64724338161b

28551−cb7e490b9fcf18f3c58e080cd740cebb

2855228099cb80634275bd50d83b232e1a5487cfbe

2855328100cb80a8a3bea68a7ab0d7e7bc6d516dba

2855428101cb81a588ada0518c10605186646249a6

@@ -28610,8 +28157,6 @@ cbd2cf93b33afb7d6c374c6fcae20fce

2861028157cbd4493806d133055d74b4bc23f163df

2861128158cbd5680c7a375f949592c065a7396cd5

2861228159cbd682859b400a2fb46ee83d41538f82

28613−cbd6e1c4071f5ab9e0e305dee43c54e5

28614−cbd8d99284066af6df43b3973c4c9f31

2861528160cbdb9c8075da1d2e172af59f08545861

2861628161cbdd67670b05b8d422acd644bb9ba097

2861728162cbde8a8677860e0f920198d593a59917

@@ -28694,12 +28239,10 @@ cc641cd4a773ad9f4cffb5228f1a85f5

2869428239cc6574e10ed17fcd7ee9b5fe064e6986

2869528240cc6584f54f0d2ba99cee06f4ccd26211

2869628241cc66c37acc67d49f9e145528aba30d33

28697−cc67204d264f71b7a0062fdc54eb0b84

2869828242cc6be062768e334c846e051b4ebf5776

2869928243cc6d14ad5c331ad04d56351648d261df

2870028244cc6e76b559fb864675993b7cd1f2a1d4

2870128245cc71b2fa94d18743c3b96c0d9f9a2695

28702−cc71ff1ca46ba592257a731716ab2c84

2870328246cc742f2c760d567d691e95f692450d1b

2870428247cc776f9c265d59dac40f28988b709e1e

2870528248cc780461ea336cefaebb576c3d8c0c78

@@ -28729,7 +28272,6 @@ cca6a9fe9559fc6b1b351115cca8c509

2872928272cca725e86d2a3e2c7446b6c511930617

2873028273cca798ad16b61787167eb9d365d797eb

2873128274cca79cc5ea29814e98e55837b315d788

28732−ccaa43756fd9858323ddb6e462d0f8ab

2873328275ccaca57bc58df4fec1400e5b9eb43c47

2873428276ccad02fbbf4def4dff2a2c3c612891f4

2873528277ccb55c3b64b359540efaedcafaa7be5d

@@ -28805,16 +28347,13 @@ cd63d93a224bf25ec62eafa906e50e67

2880528347cd65ce1dd745932c97c48fa429698302

2880628348cd65ec9a85993d154696467b2a166f48

2880728349cd66904f013121d89fa72ff0d02215ec

28808−cd68f06a46fa67aaa0650c1cb892b5dd

2880928350cd6bccdef4046defc710486d329aab96

28810−cd6bd04dce27274d98dd2816693f5ad9

2881128351cd6d1146ee30b6ba7d173847ff2764a5

2881228352cd6d7e155397db5263932aa4f597706a

2881328353cd6f87639cc14c6abd00f307792fa0b9

2881428354cd71f10f69022ecde8f1cdf631e93d66

2881528355cd74991d6af462004ae65a91447b2f6a

2881628356cd75eef241138038083b23cc0a9c038b

28817−cd76cf2de6c14687b8998acc85f3c5a1

2881828357cd7766ac8acfe52a3329003a3fe27cff

2881928358cd7c0999091c15b02740b3f67e0cbc84

2882028359cd7c5a12fc6819693e17f5b662abf4b0

@@ -28881,7 +28420,6 @@ cdefa6124dfcf90ecbe9a2be746d4f7c

2888128420cdf4b901b73db72345c91ff558c35426

2888228421cdf5af0decd41a122cc0a4adba55d2bf

2888328422cdf80266bece467aba3c378a06a9fc7f

28884−cdfa6d9ceffb47f2b8cf05f6c13a3424

2888528423cdfaa3cb36f58651c81e44c87271271d

2888628424cdfab8cd9096c3e137d1f706c5d09a22

2888728425ce039f51b2de2c5c6290aeef302545fc

@@ -28912,7 +28450,6 @@ ce3eb936fb5b332ed7bd431649ee9157

2891228450ce405bda6a9df7cd68402e5ffcd03e2e

2891328451ce46bb377956a0de61080988ea7b592b

2891428452ce49cee67d3fa5050b7439242e0c39c0

28915−ce4a099743fbcc3a9020bcdd2df1980a

2891628453ce4ca8bd41d50c4db6cad8c7c75a51f8

2891728454ce4cc12d319e7b3675495eb63208df31

2891828455ce5354ff079a64b85076d6de263a5a92

@@ -28978,7 +28515,6 @@ ced37f9c5bb9ee20dca2cce1cb83e52d

2897828515ced5f88f47572a0ebfd105ea9cb63fd3

2897928516ced710840ecb3835c1db91df744c7830

2898028517ced7b262c08c88f25be7a445e3027c09

28981−ced9613c7e8d848abdd4a8d0f0742244

2898228518ceda1dbeb15a5ca212b4452a40666a20

2898328519ceda90cc461476fd6d1c2d3a66488bdd

2898428520cedb093b2b4c3757d3994d541fb7f0b8

@@ -29173,7 +28709,6 @@ d059fbd290ae160f185eb264d85164a8

2917328709d05a223edc3f941a314389756c27c9c6

2917428710d05be6a6a40f0f0c2f42a0e85dcdaf16

2917528711d05e2327d384a21af7251027d29f7080

29176−d05f7836aaf87b47bf8cbecf7cb0c53f

2917728712d05f86c4af15c2f9c3ba05b5edef4f6c

2917828713d0600e4f490f0b4cb45c75f33048c6c0

2917928714d060c764596e1cc73faef4a1e1915e22

@@ -29193,7 +28728,6 @@ d07bbc6d0f4a4ca2059f5f02aba0d453

2919328728d08160abc8441d1e373215cbb51bb53d

2919428729d082204b2e91dd040953c1c801adbc19

2919528730d08413a7258b4987da76827200d48bb8

29196−d086ab30d5e865b7feb8cb17aef20435

2919728731d08939ec3d9304228346a89d49301fef

2919828732d08c5f43e03bcc8f5d3a7f8e80292a34

2919928733d08e3cbf95a408ce17b21bee5f186cc8

@@ -29294,7 +28828,6 @@ d1296c1283cff880f35fb0b7af6528dc

2929428828d1297dd1666cd79b001d00b4841ec3d3

2929528829d12d74758844d42072951ff5476732aa

2929628830d12fcaeccdc513f263e3cce81da97301

29297−d1337c55efda4f93d2edc7c434bef7bb

2929828831d13be8c7fdc35c105075451e33d50bfc

2929928832d14152f666bf2312e2ecc84bbe31e5bc

2930028833d142e8aafe486b18cc447d7b4b893860

@@ -29361,7 +28894,6 @@ d1a6899af4a02591c2188ddc563a370d

2936128894d1a82d07b8188d80cd6bdd864ae854a2

2936228895d1a8c3f09b7cc0c9ba4c314f23180a4c

2936328896d1b40abd6bcd116f3c602325e5bf20b3

29364−d1b57db43355790c620238dc6963ab0a

2936528897d1b62ea267b422e424f0cff5a0e2a56e

2936628898d1b71bc1d9aa9721f493956beaa071b8

2936728899d1b73a196744171dd5f7ffd19938edb3

@@ -29373,10 +28905,8 @@ d1bae669be1fd867c025fd82b00f55a7

2937328905d1bb8cc9908a4fd36b030d3e3a489a52

2937428906d1bbff7fd94587d5a9e09e7eb7a69af1

2937528907d1bdf33d619d6d46e81d1b01c721283b

29376−d1be05946c614faffaecff66e69a208c

2937728908d1c354463ff151cee3d4059fcc3d1e29

2937828909d1c798ab86b03849420f15fd23632d85

29379−d1c94fe461b176c70485ba632bf8fee4

2938028910d1c980c24af9e918585c91f6d494cee4

2938128911d1ccdc68ffde884d7470bc9fbe9220f6

2938228912d1cdfed97e4fbe8be001c04bc328f558

@@ -29787,7 +29317,6 @@ d4b879b4754838966b43bdc50ba1bfad

2978729317d4b9c338f515e82a94f6066fc3a9f09a

2978829318d4bc01498cfeeec7cf254fa925e032d3

2978929319d4be707553f579c5571e4bc573185cf9

29790−d4c1f6b6e32e5911239a8b7372f9e6d9

2979129320d4c215a5aca74771dff2ea27051ddaca

2979229321d4c224a3bbaf4c6868eb2bd158c919ce

2979329322d4c431da3f187f3d469ab1afc274510c

@@ -29913,7 +29442,6 @@ d58ef626b63db36fbe520fd4ac6b10d4

2991329442d58f7b0f7cf0633a3a7f9051eef9283a

2991429443d58fca799048238ed2bb343bc5401dd2

2991529444d58fdc47324b7a1be0b062dab65f9887

29916−d58ff97f7f3b9c605bd70350dd92de38

2991729445d5950f4e333b64d729612eace641b952

2991829446d59512c6fa06fc3b5c0ff9005bcca9f6

2991929447d597747358428d814002abda48cec29f

@@ -30030,7 +29558,6 @@ d645a3646e8df08dbd8bc4fbaebb42c8

3003029558d645be01c379aef934c1d5fcb424dd60

3003129559d6467c55a745d0e0dddbf78d6c97d08f

3003229560d6486c5f15df37b09f1e2bfcaaa781e6

30033−d648c4f319b26cfb63dc930519d4a183

3003429561d648ddb0d7e5b01b9b150723de6cf365

3003529562d6494c2b4775427fef7d418ca5b5ae62

3003629563d64a85875bbca160b1baa7fec6dba421

@@ -30102,7 +29629,6 @@ d6cecf69ff57aa0177aa795e95bb2d71

3010229629d6ced0d9335fdd54379afd89c122fa0d

3010329630d6d2297eb9c8f51b5ad732deafae32b5

3010429631d6d40175fd9c2b152391a5a43cc138b2

30105−d6d56365a2a60bc3e50e59e1591f2e18

3010629632d6d80d01d0306a41d484201bfba86e2f

3010729633d6d9f2cfa27c0360a7561b0b837d3a15

3010829634d6dac00a0f1dd7a74cfbd787ce1894b7

@@ -30137,7 +29663,6 @@ d6fdff53dd0d63caf0943ab64ebb7959

3013729663d709e40dafc19739190f714f2a98a6c4

3013829664d70d38e00a87a03ede4b40fc90a6efc5

3013929665d70e20d0bb71e9d036acd83ae9fc0d78

30140−d70f391822e07239cd506755d242e3f7

3014129666d70f54c0abac7c36908520b1a6bbf3fa

3014229667d70fa7e89118378f91dbd580e798343b

3014329668d713a53e79b72645cf7dc9f7a55c70e1

@@ -30145,7 +29670,6 @@ d715a25052ebab71a19e2a10e60923a5

3014529670d715b68105a20601442a9de8211efd03

3014629671d719ee108a38ae09ca86e9286fa300ec

3014729672d71a550b66884ee8c88ad6343216ec5b

30148−d71a5c7709f876c2bfb8f8cb2d8617bf

3014929673d71cbf957ddba62e91a53212d00c07f6

3015029674d71e3418d44e2363778d5d1fde340179

3015129675d72234b86a3de4325c1452bf7fd3a43a

@@ -30230,7 +29754,6 @@ d7ae45ea9444a5a91af4662aaab3b57c

3023029754d7b2bff9fcdee0a317d48d80b69ca60f

3023129755d7b2dce46da49ef8422ccb137d1ca534

3023229756d7b3a085e9e9024b1f0dd6c2cdbe6290

30233−d7b4dac32d4e4124505d17a53d31ce36

3023429757d7b541d081a66933adcea9cf2235ecf6

3023529758d7b5cec664694e992deb46abcba543d9

3023629759d7b5f131076556c3deb495fce7474d3a

@@ -30395,7 +29918,6 @@ d8db515e0dd20d9773c7d048f51e162d

3039529918d8dbd7b6d364da57701f3da79f1ca5c4

3039629919d8e1e9febe9d6928806ac258ad6e7d18

3039729920d8e2879b919ff5b80616912f7fb5e8a7

30398−d8e2b4a028fdbc7465dd2697655a250d

3039929921d8e5fe343fb97235f41a5b683f364c3e

3040029922d8e79fc93d982abc40d4cca9883a6f81

3040129923d8e8d9045152ad31946e45639383f44c

@@ -30440,7 +29962,6 @@ d92749265f65b19a811400391ea49879

3044029962d9280e9700f5730ef6b58c3d015af5f0

3044129963d929844f17ec45926734d3f33fb95684

3044229964d92be2b1f771a2780a15ffe26a43bb54

30443−d92d9c4ac1c31b34b8396339313499be

3044429965d935bf57235f7423712cc913f0115c18

3044529966d9362ebf453e4f1a9489156c1d5fbe0c

3044629967d936af24676934f09507e8279c088e6d

@@ -30550,7 +30071,6 @@ d9d5ff6658f3e86a16f0681e5a8bc39e

3055030071d9d6b41ae1381cb9b0f0c6171c20ca09

3055130072d9da1bd752fd1ca3f1f94dc4da8c1505

3055230073d9dbbefce8d3cc6fb856f35b67b90ea4

30553−d9e0413b487a7cb856e74e7abbc24256

3055430074d9e3414533a241f27a780832ba1436d7

3055530075d9e4bd6fe997ed4ac1b7710d6f492c8e

3055630076d9e89afb807e0773289c32c4c0c5c597

@@ -30571,7 +30091,6 @@ da061de7ae8718bf8ed7ca766fd5aa1e

3057130091da0b1cdbf01edd3f5b27306b4203b098

3057230092da0baa01ddd425958abf4187b4149566

3057330093da0bbc9da1234c616c4f0338fb02f777

30574−da0d1f8e4e459eb76a2f3b8de0b4c9c8

3057530094da116a76dd54e8eb0bd559f0aa79085c

3057630095da122af56c2e5b2f65d0db3f9737fbd2

3057730096da12faede1e1769ca4edf3d8f4d85f9c

@@ -30623,7 +30142,6 @@ da4b3fc8943168de46a6ce601e646ac4

3062330142da4da2b3118af1cfcd2f27f447e72c04

3062430143da4f50cb4282c2950052987671e0cb2c

3062530144da4f681fe9fef5e91514607933ba2903

30626−da5518b3f8819b33972c1e4722a48016

3062730145da55cf117cca98d21df71b1c1e76b969

3062830146da55e47e68434211ac5ff64e5179e9c7

3062930147da568ec080e03279292445f0d9822258

@@ -30774,7 +30292,6 @@ db62cc3ee54c23b9997a8344c8def80f

3077430292db6397477b5fa63a3308edf85542dad2

3077530293db63e277f93451f4e20c0c8f82aa87fe

3077630294db6413ec869ca83c544c85ec9932227d

30777−db64ceb568034016521ed4edf5353b23

3077830295db67bbea5cd9bde353b2eeed70ede5bf

3077930296db6b969582378074bde40ebee7daee99

3078030297db6be3cc8ac53c8c3982e20e47c7a689

@@ -30812,7 +30329,6 @@ dba6ef363301742e43fbde3b43a07f4f

3081230329dbaa92e468cb71ca638ba822eb24ebfd

3081330330dbab7a4aace2d7c0a227741a1ae33986

3081430331dbac449e6de7d00bfc082c19e4647cd2

30815−dbb3149e8d86697a0cdfde7d8280b75a

3081630332dbb55b662faf07b01a533b27305ff452

3081730333dbbc69c4d83e4a1012e502e131630ef1

3081830334dbbcc2a005d39fac6e6ce8feb608544d

@@ -30834,7 +30350,6 @@ dbe804252883314a675242c283629198

3083430350dbed3701dadbbaf0c9dd23f08cdb44c2

3083530351dbf08bb9cc3c92bc32b3f93a52294060

3083630352dbf11da88fdf22c99a76dd99e825b309

30837−dbf3ef77bdadceea2052020eee0cec20

3083830353dbf566f2ad5c76a35c22b24696944862

3083930354dbf8221584c38d47de29e4e9e57728a1

3084030355dbfa8741c4835616675a4f67d5d843ae

@@ -30860,7 +30375,6 @@ dc1fd54ee2cb7e1d321928e92247ea6c

3086030375dc20ea5ff120bbbef60ea0b8651be8f9

3086130376dc22ee056453c4c39ed91d6d6d8ceb02

3086230377dc23e9f6047621464d28b0af18994536

30863−dc2c49eab18703a412752c2692a1e0b6

3086430378dc349f80b05a430e45a01cce4b42d9ac

3086530379dc36d0651d2cc30bba8e56b0d485c933

3086630380dc3ac6131a016cfad63229dae3d61b6f

@@ -30924,7 +30438,6 @@ dcc1be292f4876eb4f98a8ca662685c7

3092430438dcc48a0401383595250f733a3c5249d7

3092530439dcca532fa8fe9efdc91d6e010461b07e

3092630440dcce839dae90bae619521bf682a7eb5c

30927−dccfb2a3806e9930596a7ab01aaa0e60

3092830441dcd2d5640c9ecfcd8c5182ccd55e97c8

3092930442dcd3de39f563d065bb4e92804aacdd3d

3093030443dcd8559edbbd6331cc07f900d81824f2

@@ -31185,7 +30698,6 @@ debc10f64c8c922766e2826dd070052c

3118530698debdae6a706748f03c641dc47c11a2a5

3118630699dec0e2bc26194a22aee36c61639ea941

3118730700dec0fcbb5516ad550387abcbeaf91da5

31188−dec11f03685eca32752ae01452cf62f3

3118930701dec205de8532cbf5c79e07c60e35aee6

3119030702dec345f0790b7782474c838312240bb1

3119130703dec56737e108b5232ce1d25c986c81bf

@@ -31381,7 +30893,6 @@ e00d364da1f6b56a35cbe394f5a253cd

3138130893e00e6ecc0cc7ca58e38ad55fa9d0f71a

3138230894e010d5dcc1a647a6d23a7f6f73fb45c3

3138330895e010d744876eb80f5c5a95a325f28f20

31384−e013dd3b7129abfc7a8a83ff5c8b8a8b

3138530896e019819dc32aed02235714b502efbaf3

3138630897e01e2a8c5b65644b35d272afaa6f4d9d

3138730898e01fbae900661573bc6c4601d5d29bdb

@@ -31439,7 +30950,6 @@ e07a2d2c7c2565cebdfc7db42bd47fc1

3143930950e07a4f6437ff08ef003df274e6d9b32c

3144030951e07f8039a11a00afbca8a56eb940923f

3144130952e0821adbbbb6528a46439cacae81f3f0

31442−e082b78e67995ddc852c7abcd67a479c

3144330953e082d60b1b31d773f877d81dad42fbca

3144430954e08495143e8f21c3fc9da71dadc811c1

3144530955e0869bda88b43259b0e4bf541ce94e5b

@@ -31547,7 +31057,6 @@ e1480fd076cfa8e48b9a57a71733f77c

3154731057e14997c28113b27abec34f593237670a

3154831058e14ef642fd4f0dea66ca3ea3cecb5fde

3154931059e14f522a44aea7c9092d7a8ab1c3fc28

31550−e14f56abcbb2f74e42ceb65d4feae020

3155131060e15160873d8b4104faff09cbeb29a1e9

3155231061e15bd12a2d340650953715dc91b3e550

3155331062e15e95f8fbe3c4133b6f4396be678601

@@ -31561,7 +31070,6 @@ e1684d441133b33a0aeedd8524743e77

3156131070e168f615e4141466abaf19d415f27699

3156231071e16be6c84ff76df369713bc86c153873

3156331072e16cb8b58da6065be9d24c323eb3ffeb

31564−e16f618787b897e227493893577c4512

3156531073e1722956de181dbb662aba8e3a0f6e10

3156631074e172540c05c9180e86cccdbd52aca5ce

3156731075e17305e53c65a5f3af933759d899bd9c

@@ -31612,7 +31120,6 @@ e1b6ae581a234431bd042fce2981d124

3161231120e1b7c49a2f9f1d5f949d24034d542fa1

3161331121e1b803f4a998f7356dce42e30ec1a1ed

3161431122e1b8b2f36e55e672bac9af1c58195554

31615−e1bc9de2b188210b61f395e2c160cbc1

3161631123e1becdf0d8433cd06dc56aabb5d35981

3161731124e1c3102eb2e47c21348f6eb52245f5f8

3161831125e1c34662679cbb111cc3b74f401f01bc

@@ -31718,7 +31225,6 @@ e2640113d3788c074f890bc9b84b786a

3171831225e2662988c0a481a5ebf179201718918e

3171931226e26a8f6a71d18500608a728d7d108def

3172031227e26aefb29d0b05ee73fe8a1f151405eb

31721−e26ecf82dca3214341fe0b273fc945a2

3172231228e26f919b1693e495e4758a6225d1d6e6

3172331229e272987ab92e8770aca13576b1380710

3172431230e275262b210284d722222ccdd0a071e9

@@ -31730,7 +31236,6 @@ e28376098f1f25de6969923e125b68be

3173031236e28673e10b0d20c83661783204296108

3173131237e2892413ddee5544c2221cd9e8b7726e

3173231238e28972cf2ab32e39e515daed1caa9cd0

31733−e28a71c1986e412860f83a5e3d4a71e1

3173431239e28b8569a78dd2aea8f192a4d9f79fed

3173531240e28d581ef4bc736accd5cf251585fd4a

3173631241e28e02d9fae12cdab85a8c2dc61cc095

@@ -31741,7 +31246,6 @@ e29018cf123845defe03b1971bae3006

3174131246e295ec3ffeba003e08d8ebacb11d99f4

3174231247e297a1ace24d2011ba332118c54edd81

3174331248e29c5bc36ed2c7db847d2205c89e0cb9

31744−e2a1d2c12b13fe77f68392b69222e585

3174531249e2a31ec05486deb7afda8e6254cfbc8a

3174631250e2a684b86c6020242a7218c0b595b9ab

3174731251e2a6ccbac30710d6d45022b9f08bc60c

@@ -31753,7 +31257,6 @@ e2b0234da4278a28eb14c7ea48757d3f

3175331257e2b04590767725a6361b74db7bda803e

3175431258e2b1f9a1c3fe7e848579cc5f86aeee7d

3175531259e2b31e3e00cf10f1b4a00f0695c42960

31756−e2b3ed5f977aa3c7cc781f1dafcb9131

3175731260e2baa9f1e76a61fe19ab9f7e16f25b7a

3175831261e2be05c0ceb581653fafc5e1c255fe02

3175931262e2c2b659cc72daed3372f685efe00b3a

@@ -31771,7 +31274,6 @@ e2d413e6524c4249533b820847c6fcf2

3177131274e2d53f79bae5800fde7cac8bab87f5a7

3177231275e2d54e5916b9c0d63c20d3e47999b011

3177331276e2de5ea053c1fb66f3f6f24b2a5ed989

31774−e2de6a50aa278dc87c279af4373592a1

3177531277e2deab68f98ea7dee9ef77828f32a342

3177631278e2e0b1508aa889c916ec363920184a3e

3177731279e2e177c543d67a73541fcd3256a19cd3

@@ -31937,7 +31439,6 @@ e424961b1ab3b3afa9958ec35c2befc8

3193731439e428589e8ea128f3d32110c1857626ce

3193831440e42b587d59992b969a8cd8c5dd27b716

3193931441e42c8358c081203a6763385628a9f495

31940−e42de701734ae79cdcac85f43aeadb0e

3194131442e42e3a759a7cb51ec7f53ffeadef724e

3194231443e42f0a01a0653b167d699be1177f913d

3194331444e4306a17b1abf8c30df5ae8028d35311

@@ -32033,7 +31534,6 @@ e4c7c5d0903bec0e7e56db239e3a47a7

3203331534e4c85da362f699c0d65bab4a8547213e

3203431535e4c9f6ce0d8440755a6f24ae5be1501f

3203531536e4cf84e6152026c3647d6bea2edbd134

32036−e4d0c126e1169d57bbb094b7b3f88467

3203731537e4d2882b24281d0df5fb4549d14587f3

3203831538e4d34b129414d3f684447a345c1e7d8f

3203931539e4d367b8947b864f3a4ecd20bbf8af5c

@@ -32042,7 +31542,6 @@ e4d8e3b300f7bb4ac3e16d5c51a7c859

3204231542e4da535dbdd477e9b2e7c8aeac402d74

3204331543e4da700e0e342217f61826a4e7459e15

3204431544e4dac23780f9ad51a82e20b4d96f7a22

32045−e4dc6bc63e9fda6d312fcca40a90bd9e

3204631545e4dcf994f6163f8cc218f6b974bf484f

3204731546e4dd1b15bc1194f046ebff96cf262fe1

3204831547e4dd5090d0cd25600fe2e552edd9641f

@@ -32103,7 +31602,6 @@ e54c36f969557d3e6af59b71128b37e7

3210331602e550ee59b9391c3383c2d12684bb9674

3210431603e55211fd538fd0e41d000bfac30bf1fe

3210531604e552588dfa993ec997d2012ce3bf996e

32106−e5530bf4f7aef478b7a507df5a532aa0

3210731605e553d8682ff8a0632c8f8b84424bcfa3

3210831606e5540991f1375e90d365954ed93b581a

3210931607e555e1564c7fa6fda70392298452be31

@@ -32150,7 +31648,6 @@ e598ccb7077a803dc3e6aec39cc25eaf

3215031648e59a6238e33af6068f4b5f8c5a83e0bd

3215131649e59a9c45d10476a6e4a83ec5595044db

3215231650e5a0edf16b24c1d43717def419fd63f2

32153−e5a4352431de876a7981c4f04ff1d477

3215431651e5a560bc2329e87f4706e1e5db01af57

3215531652e5a61b7a409f20ed2423e1a111c2555f

3215631653e5a79e07b1862c517dd3de385cd75e31

@@ -32177,7 +31674,6 @@ e5cf19505e11e73a18b191cebdcacd50

3217731674e5cf58b5b0ab643c8142e1022451ab04

3217831675e5d028d1720d6fb33d93e71d18925187

3217931676e5d291d4104b8e8e108e9bbd25dceafb

32180−e5d4f913ad86dc9f1eca33989eb20bd7

3218131677e5d56f4eba6b402b9c015a20f5590559

3218231678e5d57a7389509e369373217eff7c5977

3218331679e5d63207b40adbda2fe65799878d28ba

@@ -32205,7 +31701,6 @@ e5fbc2e55f647fe098760778d75f0bf4

3220531701e5fcec949c6fd1da27d5c03fe42fde48

3220631702e5fd22770ba4783db878b9b35a88cbf5

3220731703e5fdab0994c53495e611cb6727310641

32208−e600cccb1935517c56d319f395635982

3220931704e6018b235ec221dae6cf18557c98ff05

3221031705e6032472f02c18f2caca24d8a24e6015

3221131706e604ebc336de0c5c0ba2c36569881b97

@@ -32322,7 +31817,6 @@ e6cbe20a82c2f77ec11a3cdb09ee45d6

3232231817e6ccacf98998344e6a3e1efeb3e2f719

3232331818e6cea313b0c2b1230908d8c34163795a

3232431819e6cef5b2d261dc3f678dc1d07131c886

32325−e6d230aa576c6c0cd3e666b1f7c7cc9a

3232631820e6d34689d17d5455e573f7325b929f22

3232731821e6d39122bea94a1cfff9267b67d5d3bc

3232831822e6d3a9ad43736a33d803097a9ba5b2a0

@@ -32384,7 +31878,6 @@ e7393c8abae8b8676deebace8c6c711f

3238431878e73d6ba8a713a5b70ff3a3b9ee8b12e3

3238531879e73ee95fde32570e79272555a7fdd951

3238631880e73fc1b64daa6e23fa94be10701a991b

32387−e7409f7463a1099a7e496bff1f43ecf2

3238831881e74287b051d0f26d9349526dead792b9

3238931882e7463608be58c6cfe723d246a38554cb

3239031883e74678f410bfcc4e5c599180552a11d3

@@ -32598,7 +32091,6 @@ e8d0f6f6fd7193aa4f6827982cbcf5ed

3259832091e8d4a8e65262252b419a77435d4d8caa

3259932092e8d4d44df4b56b531f6a8fd40b83e403

3260032093e8d6deab04273e99d2c405f4fa8baad0

32601−e8d79044a2e1b55fd31724f833411f5e

3260232094e8d7fc269594d4fbd790965c7ce19e76

3260332095e8da4683d117bc4fec68a4c9ba414216

3260432096e8daa35fcf155fdf64e48aafe7da30c8

@@ -32728,7 +32220,6 @@ e9e04f85b35ffeb16e62dcedd5599527

3272832220e9e10e33c505ed03b4c679cdab2cdf4b

3272932221e9e17232ad119002f31b79fc7b5c4509

3273032222e9e48c0bf3a466dcf9bebe3197b7b86d

32731−e9e77f48f0b7e73bb707d198e8427d16

3273232223e9f297fe8ff52304cada446d36869417

3273332224e9f60b81103fa0fcc9d1e467be9d5eb7

3273432225e9fdf914c5d33786b7be914b23832edb

@@ -32763,7 +32254,6 @@ ea3cf3653c7d392f73a043740fb56973

3276332254ea3d0ef5b1c0027eb654cbe666f40094

3276432255ea3e9ea040587ff9b72dd905d7f8f25b

3276532256ea3f8e4fcbe51bd315af71e90146031d

32766−ea4012ddafb54d4e22fbd73683be996c

3276732257ea462d890fc3ba657601811149da03a0

3276832258ea46932799c9d625aa7bfdeec60d2855

3276932259ea46d8209b3624b5bfe1fbc50f2edf5c

@@ -32801,7 +32291,6 @@ ea84756974e761ff34f3a1e1a3c3f50f

3280132291ea84e942c01ca0261280a1303549e5e0

3280232292ea8503e6f64a543136346788c9b6e6de

3280332293ea85f4311bfe7ec3d09f5419d6161e48

32804−ea876c5a9bf1583e8ce8f6422c847c7d

3280532294ea88166d4203952d2d2241c7c437c2fa

3280632295ea88d4c8f4a9075fc3dec4b8584d6596

3280732296ea89a393b666e752ccce285fc1da41dc

@@ -32850,7 +32339,6 @@ eac65d560bdc9f58ff2c98fbb9685a96

3285032339eace0eef94d323e137ab199a486a0e17

3285132340eacfc8393e2836278b9466b6bc836fd1

3285232341ead0676fb7bb9c95c595aa7a7a314d05

32853−ead13d43429b08d5bc3c3513801bf3eb

3285432342ead4bf399b7dbd1b4be4b9727cb3aa08

3285532343ead588f2dba3ef699573a125b4f98df6

3285632344eaddf1e6c89bf586f5c2972e75c45b49

@@ -32884,14 +32372,12 @@ eb0f103a9fb95fb00ce936cca6efe986

3288432372eb1101552493ecbd2cbcf9f5933e1e02

3288532373eb11f8a76524e9992208ef24835973bc

3288632374eb123dd91617d541cd9f40f4d649a764

32887−eb131ef0cb9fa18c59319d393658ccc5

3288832375eb1387576d4b9c915957f8cf48a93bdf

3288932376eb1527ca474e7564c11c8ffb8463b088

3289032377eb15a1e27856b94a24750951861854b4

3289132378eb16c9cdf13dc653edff10ccef9612e8

3289232379eb1a20e388fc675a24956247ff5c66b0

3289332380eb1b439a5cbafd002a3b60db7affe960

32894−eb2289dd0f4ceb4a0e6558eaa75914d6

3289532381eb251bc2bad285da6c979a1fa71453cf

3289632382eb26bd3c710ace0d2020630ac75eb3e6

3289732383eb26cda1bc27567f41f22f319a4e4dcc

@@ -32907,7 +32393,6 @@ eb44e7fe94be1a7de381cbeb011daafc

3290732393eb464dc781c64aca17103bc92ac6e9d3

3290832394eb46598de220a093b53df017f1c57bb7

3290932395eb4673632a02554744e12dfc73a150ab

32910−eb484ee869449eddeb5bf8c5889a65dc

3291132396eb496b45d980638b3451eef60a54e647

3291232397eb4fb69204db2037aa0e61df8f68b3cb

3291332398eb53bfb7a4cf1304042157c0a80be377

@@ -33050,7 +32535,6 @@ ec621d602552e74c25727a825db5b397

3305032535ec62c9ac2160965614c2c7704a68479f

3305132536ec654a1a257297af1debbfdab386ad2e

3305232537ec65ffd73c35fc5413abe22fdc21b5cb

33053−ec694610d83990add64324bb1b1cce01

3305432538ec69fff7941a3b2a1461c6c3becb5cb3

3305532539ec6bb1e857c6ef18bd6ad1b649150ee4

3305632540ec722ed19d527aa7b7779df63f320c1b

@@ -33083,7 +32567,6 @@ ec9e04670ff51d24e93d43130ee35f19

3308332567ec9e9085891b0a966cfc4bbbfefd8445

3308432568ec9ff1773b843f396c3d30b60b5a3baf

3308532569eca0d7559559adda1d7daceae0df7ea8

33086−eca1287c5355e0d6a075edc03d230998

3308732570eca206d8137baa207ecbdf765c2e1e3d

3308832571eca411016124b384ef9d139bbc50f1a4

3308932572eca4278a981f64ab0e3a28171cd6f1ee

@@ -33167,7 +32650,6 @@ ed33db04354228b8f21cd5a6a00c6f9e

3316732650ed346c869699cf46fc00d01c539c89ba

3316832651ed3546dd515c8e89398d75eee2d10593

3316932652ed35bf1cae60198deede544b43e4854f

33170−ed36650126797e2e9dde8614073ced95

3317132653ed36a65b8370e52e12c6ba1ec72119f7

3317232654ed36ce0453cf2a3fb7489490ddb36db0

3317332655ed37fe9a4688f43fc02109054f09ce5b

@@ -33488,7 +32970,6 @@ efa9b7b7138797daed640923a70a8636

3348832970efaa89d1b3f75db504312185e9f9415e

3348932971efaae2c612025818a729a57db42cd0ba

3349032972efaf168bdd4ba45c6dea432cf7790fc5

33491−efafb227e67adfa8d022d76a611d9148

3349232973efafe01cb7d9b16572a1586cc277442a

3349332974efb1d92870a835efd11dd37a60abce16

3349432975efb5ee0c0ec047e2e7014c024fdf3132

@@ -33519,8 +33000,6 @@ efd62322d7e21b6b50e6a4375b5b63d1

3351933000efd64ab2eedc8f8aaf1dea5e8d8e0387

3352033001efe08a006631effb2bedf98eabef18b8

3352133002efe15ee3c834a777877c34f892ee3e8e

33522−efe19d500d8ed1818304ce46304a1f93

33523−efe1a88b8b3327b8e27bdfb90070a752

3352433003efe445e822a5f32e583b467ce029a45f

3352533004efe59ab1ef7324f746b15f9b37498aa9

3352633005efe6f4365049ad75c20ba2c74373a466

@@ -33531,7 +33010,6 @@ efea977a877dc555f1e060a5d9fc5a56

3353133010eff3bcafda516eb9a9167e8dd8b68f29

3353233011eff68abb18ce770141c38d00db03344d

3353333012eff700afb91d464894cdf3ab76056447

33534−eff885030a722ba20a93710b2f9d0575

3353533013eff9f458c15bfb6a8e2e0bf8fbc4b898

3353633014effb7a05e07f99d19d1816b8567c9950

3353733015f0013e31f2a5547e7779cbe5cf05903f

@@ -33560,7 +33038,6 @@ f03b52a80e8f06d201732340ba8fa1ed

3356033038f03c8e0ace27427329abca59b1510ff3

3356133039f03cee29ddf3989466386ccee617e225

3356233040f03cf744a7d04ec465d54a3708c69977

33563−f03de9eb0074c8fca5433659749ec37d

3356433041f03e6cd84dbe3d6aeabf4df2c187a482

3356533042f03ecde1a8cee0de7e22e2f83db249df

3356633043f03fd36e9adfe59870c22986dbebd5ac

@@ -33655,7 +33132,6 @@ f104bb15657cb4a857eba1846e58d88e

3365533132f105205316654dbb1f9ddd7a41984dc0

3365633133f106ba86083f603f695a30644c7775f4

3365733134f10bea1a3623592c343a0f03df3fae30

33658−f10d5eeb6c7177610c6de601dc1cebd7

3365933135f10d6d267b76821a779cda8cd3f72ee7

3366033136f10e42df74605914db317d308d5ef1f3

3366133137f10f9d6238792d69ec6160c67ecd75d9

@@ -33689,9 +33165,7 @@ f135b7ea9d1fab5781c6a50e37259efe

3368933165f13802fe58323e16281f8212349df294

3369033166f13911b1e96eef8d0359e66e22cfd90c

3369133167f13dfd804bacc6cae399f567c32f59d6

33692−f13f87b03b2b1c5e9765d1be4be146aa

3369333168f1407fede683d782d17bf4f224120020

33694−f14137cf63cc3e6b202da6aa2590dad6

3369533169f1419ae89c26cc2202a863d8a2e696e5

3369633170f1450de7cc2a1f1f0dd763fdd0fd57c6

3369733171f145281f93d607c2a457dde9b869a270

@@ -33703,7 +33177,6 @@ f14ad576421ba9b1ffb3e75941484a91

3370333177f14b92a03c3b3aa87e4cc21651aac0a2

3370433178f14c2feb838a689cc3390191f970c158

3370533179f14c5e1988ca5125598d8617dd4613f6

33706−f14e104634264c656cd40b7df4f3b552

3370733180f15740be3f8881b15bdd4e17d94bfee0

3370833181f158588be31293e526a3c5553d8357ba

3370933182f15a03f9c8860eee81816e6656f71e02

@@ -33756,7 +33229,6 @@ f1b332fb596adda7d5b1abd055259640

3375633229f1b668333e70d0c25c8f5ad0740b4d84

3375733230f1b69054ec8bdb7aff4e525223a93ede

3375833231f1b87a1636410db3a7e894fa5f6d9b6e

33759−f1b985862e4fed1c495dd4b068270243

3376033232f1bd7cdd4dc275ae30438327b135a7d0

3376133233f1be4a15a7cda0eb1298d9b5bde8fa04

3376233234f1be68315e1679728bc7294b50d50440

@@ -33780,7 +33252,6 @@ f1d550e7b25df51154c7620a20f9044d

3378033252f1d793eb2a0be53ae096d0b1780f57f8

3378133253f1d819018d5502e2d08837edb50da392

3378233254f1d8e5becfbc39c821e71b8c58bf3ec2

33783−f1d96952a2b0837e56a1ca72412ca984

3378433255f1d96a425c2ed1ef42e7093221f25c79

3378533256f1d9813a045742dba81dd7ea92e5ef14

3378633257f1daf2469d620c400f8c6f8ab3e7667b

@@ -33799,7 +33270,6 @@ f1ef4714a4f7ed212f8b05f7d9a2fb53

3379933270f1f5c64ff4b4aa37b84c08e3d790f40a

3380033271f1f9bbf72c87a222d63da0503f37acb7

3380133272f1fc6d3fd4cdca6e420dbc41245a8980

33802−f2010079404faeb9230b02a28cf3bf48

3380333273f201457ea88831c9aad70993e287de4d

3380433274f201b5fa222fffb54acffc94d1bf6992

3380533275f201e1203ffa459965eedcb952871018

@@ -33873,12 +33343,10 @@ f27462f0a4f6ae27ff7e2db8adc55c8b

3387333343f27bc8008cc77583349797e34ff5ee18

3387433344f27bfe0e28c7934424b9465c5e00db91

3387533345f2808808f00e00b8c48d9093c789e881

33876−f281c16724d1234d48591da20c6e116a

3387733346f283c7d143a72288491f02f6669b4a48

3387833347f283f93c1dbe4f1ef3f37eaed2498bc3

3387933348f2863963cb5d1ac4388ba25c67aceaeb

3388033349f28ac0444b9811d7fc89cf0b5fa438d3

33881−f28c5910b72d17b52da4990e64db0632

3388233350f28d23646da6dbba7b2e4652b836b436

3388333351f28e11551b7e865779352b76d19adf55

3388433352f28efdb343696e6287651d097a34521c

@@ -34020,7 +33488,6 @@ f3874ac1a3236de7905764f2a3f63a9d

3402033488f388de13c14ad0d14573305ada342632

3402133489f38af6fe429b4db4f7b4c69c803c4d9d

3402233490f38efccd22c3adb4011970233bd2d0c7

34023−f38f1b14936555428f006164542808b2

3402433491f3901743dba3e9f5b514dd752c7ab524

3402533492f39075c48853c17a65316ba2ade23c0a

3402633493f391c7e780ac080b653aeccab717f067

@@ -34111,7 +33578,6 @@ f43b0a557dc3564b86aa904b4bd5cca6

3411133578f43eb02a7180e676402026f284abddb0

3411233579f4438df1250db346250c1fdd9100c7cd

3411333580f444f5bdbc3af39568c96a1c0e0e6f4f

34114−f446e3e89d03bef154fac7a62406deae

3411533581f449d81c61acf2fe6f5fe15d6da72805

3411633582f44c2c0a8443bb4d759e275d6e39a03c

3411733583f44dc0898a4a016f56070cdd45e77c89

@@ -34139,7 +33605,6 @@ f47b3da133075a559d8484fd417599e6

3413933605f47c9229b3c19e99bef78eff24a698f9

3414033606f47d463435efa4a438ecf091d87cdb84

3414133607f47db00ec563292f0ba196b047e954c4

34142−f480bb85757affca9b347784b7ebe4a7

3414333608f480fab9a90475b30e3bb8e427df689a

3414433609f481312137481cbb0cf2e31a5f2ea517

3414533610f4825c602e88942559f1a8bd7eeec8e6

@@ -34259,17 +33724,14 @@ f55e7d21caddbd10c20a949bb8e6f929

3425933724f560c8a07b34b53bdcdfd11fe40728f9

3426033725f5626f73bb6ab25c3fc11ba2f9fe6975

3426133726f5664daf1640f2eea306e0c2926c6df6

34262−f56670f0b8fc22db2a6d350b73c961de

3426333727f566775b7e5854372d71f0f971330004

3426433728f56cbf43c07bd89410cb02bca7cde757

3426533729f56cc61e87f8a314cc070fca2cb010fb

3426633730f57050db3d71775ff4a6c5ae1d02810e

3426733731f570ac81e2f7fd0e9a02499bac51803a

34268−f571251d7bfe841da26713cce1be109e

3426933732f573a2469356eae98c73045c1d1a92ab

3427033733f577217484a75a1f24d99331f9b568ec

3427133734f577b6fa3054d843c0349cd068174419

34272−f578a2f9307da820265b680e31925590

3427333735f579bd2266eaa885904a9d5fe5ad215a

3427433736f579d195c69fce03aaa7cdc5e7beed48

3427533737f57a32921d7145a5fe20022d0804ca0d

@@ -34363,7 +33825,6 @@ f6028bae7448bc888bbffaa55d6871f4

3436333825f60535577ff1f14f2eaafac806597411

3436433826f606dcdeafa5f27bc64db2c471ec089f

3436533827f608124ba52a311d57b33dbf32f95776

34366−f6099610dc1ce4200719ebcc1f919abc

3436733828f60a67b7a477046b4790f7bd4dc83e13

3436833829f60fea42cc1810a1185153a9fa8dfe2c

3436933830f61169e349aa479ce02c36d96647cd01

@@ -34498,7 +33959,6 @@ f70a126391b7410a946125d339ca9960

3449833959f70c3539f6204e5b0b7d002504fa52b5

3449933960f7126f8523c107f7ae1737eb065654a8

3450033961f71449b25597bd6c24208c8524187ddf

34501−f714bee2320f72be6d229dbd2eade571

3450233962f71502b9cc0d79072d684685a01304b5

3450333963f718993a945317209af7bc58ec8ce66b

3450433964f71a30c22504d1ace33bcc747edee685

@@ -34536,7 +33996,6 @@ f75a64fe3d7c826e9fe782dd6d77a8c0

3453633996f75b1a6ed10c64efc01e36a7913149f5

3453733997f75b43792288d3e2d4048e233685cc3d

3453833998f75b4c5182774430950b0949d2bd2841

34539−f75c1eee5bb895c469a7b1269aea6108

3454033999f75c7379023b73658e0346b451e0e833

3454134000f75caaf95b7828cdd4040b6cfcc0c8af

3454234001f761c54567315a5151bb47c95aca90c4

@@ -34583,7 +34042,6 @@ f79b1b4c9efa662c91ec7db6ebda8f97

3458334042f7a20485b63536aff4170b457cc43bfe

3458434043f7a4af8f06680d894cf434894184fdff

3458534044f7a6275abb2fe0d978f00c186228ec3c

34586−f7a8b684bf74353fbfcb4bbc04502213

3458734045f7ab7695746827e9c24d4f1aea7ef2ba

3458834046f7ad88e3c5bac4b70c974088bd122665

3458934047f7ae4afc1636933aad9c685c6c2ba178

@@ -34708,7 +34166,6 @@ f887ef0a7dda73b68859e853c9270de5

3470834166f88bc35242dadf4266c97034385db908

3470934167f88c6a654d5232a7eace1b19c143cb93

3471034168f88dda5c9f5fad47e0c0f3bb795b4d38

34711−f88ffae23ac185460fb81e7d3c39b1e9

3471234169f8919fa4676cd15f6b85d73d2b245958

3471334170f892634400f3ab771dc95ea36440e60a

3471434171f894ad8d3233058974673b3b9a4cf264

@@ -34777,10 +34234,8 @@ f91680a65a27724b2a3e541c4beb38cb

3477734234f916ae346ea7dbfaa0bcd0e3c357769f

3477834235f918824b7a19c28415cedb4dd0dc7d0c

3477934236f919748d89a3ace4c89a30f46e8f66cd

34780−f91caf4dd95745aec4c4db88f79fe8af

3478134237f91d4097c44ba6c933855464c3f2fffc

3478234238f91d79d2592ee0096d5f0c598d3e518c

34783−f9240681d891810ef10b99ea23100d2b

3478434239f924dca6955cf2eef3224eb186da8921

3478534240f925ec176a8cc6f95051d78c17dbc3e0

3478634241f928eb5de7baabdb19edd59d4aede584

@@ -34800,8 +34255,6 @@ f93d6dafcd5e3011941f0602228ce1c4

3480034255f940220dca66fce05af1d2315d588b6e

3480134256f9429199f5c547be10f0e3ab14fc70dd

3480234257f943ec365b0fbfe309ec9d344d59a480

34803−f9450e92bcebe5f9991bfd0e27b60aae

34804−f9453b3e0e93132dc959c22a43127183

3480534258f946683e3190902b4b03e1b708cf1f52

3480634259f9468bf1355078be9bcdd7d40b6272b3

3480734260f94881e3cc6aa183f79fec0ef95ec0b5

@@ -34830,7 +34283,6 @@ f97c2a82de0b5a362b0c11a40117cd53

3483034283f97df9707de7048563e3ec1f67152e5e

3483134284f980ef5b5ad6f60a1a8cb7b75c69e7c7

3483234285f983e38c46e27dc8d929df7e79746e93

34833−f984d5ab5aacf0d37c884489b4113940

3483434286f98777010985cbbdde90b537ae428341

3483534287f98ce57c07016f0874788382bc088c7d

3483634288f98d1f1c28a0a9727951a3ecaea39579

@@ -34881,7 +34333,6 @@ f9dc7709335aa2327f12c6f13ac57800

3488134333f9dd0b1a0520c482a94a8715e8adee78

3488234334f9de7244b5124a7f7cf3c068318147f2

3488334335f9dedad92c95e5d2ca98de25293e69d3

34884−f9def50e69fe063412f941b48cbc7256

3488534336f9e05a49b1c65b3b1f7daed40b42107c

3488634337f9e0da0085e9033ac59e8c462e2b7252

3488734338f9e2b3179ca9b381e2690ab260ff92bb

@@ -35013,7 +34464,6 @@ fad5d277bf6839419102c5ef60f85a93

3501334464fad67636e83a6043af77179e008b8712

3501434465fad67e54c7d83f57c2637d31577ae9fe

3501534466fad710fafe96cc650cccaa43c0c87b4d

35016−fad761538543f6cb5bbdd457b1e3c606

3501734467fad7ef725b8aed057408a25958c250a3

3501834468fad896395e8fc5a91ed882ee2e47fe72

3501934469fae0d439a8a45e7ae8ab5286c046020b

@@ -35059,7 +34509,6 @@ fb22ea4fa551ab36438f29ffb35cf939

3505934509fb2727538d22d63a7d6bc2b1b8b07a8c

3506034510fb2735b0b232e970c26c23fff320241a

3506134511fb291e829476e0e2d62e07a8bf28cca8

35062−fb29a9f0f6362e4170a93fc96c96ea6c

3506334512fb29dc7ea8d1c118b759f974d08e741a

3506434513fb2c3b2d7fcc1ccb9ebdaf70ece9c60e

3506534514fb2d42f89745cde9387f647959d148e8

@@ -35250,7 +34699,6 @@ fc8174ee6ccfeb7f8ba09969aef9b8d0

3525034699fc8262c8ce98a11d9a765a5e905fe3a0

3525134700fc835e402383f24b56708b4680d1284b

3525234701fc83fb0fa8953deb39a6cc1b39b3b8c6

35253−fc866437834e457a7597a76a5baa2df1

3525434702fc8ae1fff5a50e2ccc31dfd454791b50

3525534703fc8b97c3cb6b15cebc69a67c2f1d191f

3525634704fc8dd5d947e330bc8d31ba285ede5a51

@@ -35261,7 +34709,6 @@ fc97296809c1ea00d1cfa01ed2e25624

3526134709fc9af53c64a1d60eef0cbb3ce8830792

3526234710fc9c7f397c7db23a95eb28a6075c83f4

3526334711fca1348857c1ba55b85a2f970a4f008b

35264−fca1776e9cf97ab5d32aef9dc189b818

3526534712fca1a6f3fe5c39547951d00163a67a1e

3526634713fcaa9e9cd6c6b870d290ff95647cdd7d

3526734714fcafabb7d281f7332f0511afb765cb1d

@@ -35296,12 +34743,10 @@ fcd65c311c175ee59a8e05e13686bb42

3529634743fcdc5c5445ce000e8d63836f98f1bdb3

3529734744fcdcb327424ebf3e67c8b263776a2407

3529834745fcdd5911b681da6d764f3aef53cfea04

35299−fcdf492bd75a038407d235a0e4413839

3530034746fce007403bb941cb31d4aa53a5cd54b6

3530134747fce05034c443f97aea28b8101028b037

3530234748fce248a57134c6495046c0d12c47c1f9

3530334749fce2d214a8fe8ad5dd3d6fa99ca726bf

35304−fce4aa39b420029654cbcf0e8fd2ce33

3530534750fce4aa83430b1a1c1dd2bc8ef3825347

3530634751fce6d08af9e01cb22975a6a3f90009e1

3530734752fce7355e30529dc9085a476dd94f8ed1

@@ -35688,7 +35133,6 @@ ffbcd43aa88c27bbaf8e2fd6907faaed

3568835133ffbf4efac6f9d16dadbf3cf7a6d4612b

3568935134ffc1006148dd133b1953cd96a431adbd

3569035135ffc256d13f4df40bf09c0a0e7d68b315

35691−ffc613c073b6677d6717edd112f10a47

3569235136ffc775490528b517eff7d17e397510f3

3569335137ffc8e908fc26935d33c25bb4ebf070b3

3569435138ffc94869e1d121f3239c80a4b6692914

@@ -35723,7 +35167,6 @@ ffeb50773926188e20ddbfdb08212eaa

3572335167ffed5926e8ea23b3cb743d4075d61452

3572435168ffee9a7d8f0b158120861f460aff695c

3572535169fff0ab39c75cf5441fcece68da746c7c

35726−fff1bbba90ee509950dc3d634fd6efa3

3572735170fff2eed02d5934c5443f7b727bcdb8bd

3572835171fff33d3a8a4c6b80f5e80052eb7c897d

3572935172fffb3b61e603ae263fd0b9f3b085fd63

searx/data/useragents.json+3−4

@@ -1,9 +1,8 @@

11{

22 "versions": [

3− "94.0.2",

4− "94.0.1",

5− "94.0",

6− "93.0"

3+ "93.0",

4+ "92.0.1",

5+ "92.0"

76 ],

87 "os": [

98 "Windows NT 10.0; WOW64",

searx/data/wikidata_units.json−1

@@ -207,7 +207,6 @@

207207 "Q108888224": "GeV/c²",

208208 "Q1091257": "tex",

209209 "Q1092296": "a",

210− "Q110143852": "Ω cm",

211210 "Q1104069": "$",

212211 "Q11061003": "μm²",

213212 "Q11061005": "nm²",

searx/engines/__init__.py+1−1

@@ -275,7 +275,7 @@ def get_engines_stats(preferences):

275275

276276

277277def load_engines(engine_list):

278− global engines, engine_shortcuts # pylint: disable=global-variable-not-assigned

278+ global engines, engine_shortcuts

279279 engines.clear()

280280 engine_shortcuts.clear()

281281 for engine_data in engine_list:

searx/engines/command.py+1−1

@@ -35,7 +35,7 @@ def init(engine_settings):

3535 if 'command' not in engine_settings:

3636 raise ValueError('engine command : missing configuration key: command')

3737

38− global command, working_dir, delimiter, parse_regex, environment_variables

38+ global command, working_dir, result_template, delimiter, parse_regex, timeout, environment_variables

3939

4040 command = engine_settings['command']

4141

searx/engines/gigablast.py+13−24

@@ -5,10 +5,10 @@

55# pylint: disable=missing-function-docstring, invalid-name

77import re

8−from json import loads, JSONDecodeError

8+from json import loads

99from urllib.parse import urlencode

10+# from searx import logger

1011from searx.network import get

11−from searx.exceptions import SearxEngineResponseException

1212

1313# about

1414about = {

@@ -22,9 +22,6 @@ about = {

2222

2323# engine dependent config

2424categories = ['general']

25−collections = 'main'

26−search_type = ''

27−fast = 0

2825# gigablast's pagination is totally damaged, don't use it

2926paging = False

3027safesearch = True

@@ -37,8 +34,6 @@ base_url = 'https://gigablast.com'

3734extra_param = ''

3835extra_param_path='/search?c=main&qlangcountry=en-us&q=south&s=10'

3936

40−_wait_for_results_msg = 'Loading results takes too long. Please enable fast option in gigablast engine.'

41−

4237def parse_extra_param(text):

4338

4439 # example:

@@ -59,6 +54,7 @@ def parse_extra_param(text):

5954 if re_var is not None and re_var.search(line):

6055 extra_param += re_var.search(line).group(1)

6156 break

57+ # logger.debug('gigablast extra_param="%s"', extra_param)

6258

6359def init(engine_settings=None): # pylint: disable=unused-argument

6460 parse_extra_param(get(base_url + extra_param_path).text)

@@ -69,17 +65,14 @@ def request(query, params): # pylint: disable=unused-argument

6965

7066 # see API http://www.gigablast.com/api.html#/search

7167 # Take into account, that the API has some quirks ..

72− query_args = {

73− 'c': collections,

74− 'format': 'json',

75− 'q': query,

76− 'dr': 1 ,

77− 'showgoodimages': 0,

78− 'fast': fast,

79− }

80−

81− if search_type != '':

82− query_args['searchtype'] = search_type

68+

69+ query_args = dict(

70+ c = 'main'

71+ , format = 'json'

72+ , q = query

73+ , dr = 1

74+ , showgoodimages = 0

75+ )

8376

8477 if params['language'] and params['language'] != 'all':

8578 query_args['qlangcountry'] = params['language']

@@ -97,13 +90,9 @@ def request(query, params): # pylint: disable=unused-argument

9790def response(resp):

9891 results = []

9992

100− try:

101− response_json = loads(resp.text)

102− except JSONDecodeError as e:

103− if 'Waiting for results' in resp.text:

104− raise SearxEngineResponseException(message=_wait_for_results_msg) # pylint: disable=raise-missing-from

105− raise e

93+ response_json = loads(resp.text)

10694

95+ # logger.debug('gigablast returns %s results', len(response_json['results']))

10796

10897 for result in response_json['results']:

10998 # see "Example JSON Output (&format=json)"

searx/engines/google.py+11−20

@@ -8,7 +8,7 @@ Definitions`_.

88 https://developers.google.com/custom-search/docs/xml_results#WebSearch_Query_Parameter_Definitions

99"""

1010

11−# pylint: disable=invalid-name, missing-function-docstring, too-many-branches

11+# pylint: disable=invalid-name, missing-function-docstring

1212

1313from urllib.parse import urlencode

1414from lxml import html

@@ -108,9 +108,8 @@ filter_mapping = {

108108# specific xpath variables

109109# ------------------------

110110

111−# google results are grouped into <div class="g ..." ../>

112−results_xpath = '//div[@id="search"]//div[contains(@class, "g ")]'

113−results_xpath_mobile_ui = '//div[contains(@class, "g ")]'

111+# google results are grouped into <div class="g" ../>

112+results_xpath = '//div[@class="g"]'

114113

115114# google *sections* are no usual *results*, we ignore them

116115g_section_with_header = './g-section-with-header'

@@ -122,8 +121,8 @@ title_xpath = './/h3[1]'

122121# href=...>

123122href_xpath = './/div[@class="yuRUbf"]//a/@href'

124123

125−# in the result group there is <div class="VwiC3b ..." ../> containing the *content*

126−content_xpath = './/div[contains(@class, "VwiC3b")]'

124+# in the result group there is <div class="IsZvec" ../> containing he *content*

125+content_xpath = './/div[@class="IsZvec"]'

127126

128127# Suggestions are links placed in a *card-section*, we extract only the text

129128# from the links not the links itself.

@@ -275,12 +274,7 @@ def response(resp):

275274 logger.error(e, exc_info=True)

276275

277276 # parse results

278−

279− _results_xpath = results_xpath

280− if use_mobile_ui:

281− _results_xpath = results_xpath_mobile_ui

282−

283− for result in eval_xpath_list(dom, _results_xpath):

277+ for result in eval_xpath_list(dom, results_xpath):

284278

285279 # google *sections*

286280 if extract_text(eval_xpath(result, g_section_with_header)):

@@ -291,27 +285,24 @@ def response(resp):

291285 title_tag = eval_xpath_getindex(result, title_xpath, 0, default=None)

292286 if title_tag is None:

293287 # this not one of the common google results *section*

294− logger.debug('ingoring item from the result_xpath list: missing title')

288+ logger.debug('ingoring <div class="g" ../> section: missing title')

295289 continue

296290 title = extract_text(title_tag)

297291 url = eval_xpath_getindex(result, href_xpath, 0, None)

298292 if url is None:

299293 continue

300294 content = extract_text(eval_xpath_getindex(result, content_xpath, 0, default=None), allow_none=True)

301− if content is None:

302− logger.debug('ingoring item from the result_xpath list: missing content of title "%s"', title)

303− continue

304−

305− logger.debug('add link to results: %s', title)

306−

307295 results.append({

308296 'url': url,

309297 'title': title,

310298 'content': content

311299 })

312−

313300 except Exception as e: # pylint: disable=broad-except

314301 logger.error(e, exc_info=True)

302+ # from lxml import etree

303+ # logger.debug(etree.tostring(result, pretty_print=True))

304+ # import pdb

305+ # pdb.set_trace()

315306 continue

316307

317308 # parse suggestion

searx/engines/mysql_server.py−2

@@ -13,7 +13,6 @@ import mysql.connector

1313engine_type = 'offline'

1414auth_plugin = 'caching_sha2_password'

1515host = "127.0.0.1"

16−port = 3306

1716database = ""

1817username = ""

1918password = ""

@@ -37,7 +36,6 @@ def init(engine_settings):

3736 user=username,

3837 password=password,

3938 host=host,

40− port=port,

4139 auth_plugin=auth_plugin,

4240 )

4341

searx/engines/prowlarr.pydeleted−80

@@ -1,80 +0,0 @@

1−# SPDX-License-Identifier: AGPL-3.0-or-later

2−"""

3−

4− Prowlarr search (Files)

5−

6−"""

7−

8−from json import loads

9−from urllib.parse import urlencode

10−from searx.exceptions import SearxEngineAPIException

11−

12−categories = ''

13−

14−paging = False

15−api_key = ''

16−indexer_ids = ''

17−search_type = 'search'

18−search_categories = ''

19−base_url = ''

20−

21−

22−def request(query, params):

23− if not base_url:

24− raise SearxEngineAPIException('missing prowlarr base url')

25−

26− if not api_key:

27− raise SearxEngineAPIException('missing prowlarr API key')

28−

29− query_args = {

30− 'query': query,

31− 'apikey': api_key,

32− 'type': search_type

33− }

34−

35− if indexer_ids:

36− query_args['indexerIds'] = indexer_ids

37−

38− if search_categories:

39− query_args['categories'] = search_categories

40−

41− params['url'] = base_url + urlencode(query_args)

42−

43− return params

44−

45−

46−def response(resp):

47− results = []

48−

49− json_data = loads(resp.text)

50−

51− for result in json_data:

52−

53− new_result = {

54− 'title': result['title'],

55− 'url': result['infoUrl'],

56− 'template': 'torrent.html'

57− }

58−

59− if 'files' in result:

60− new_result['files'] = result['files']

61−

62− if 'size' in result:

63− new_result['filesize'] = result['size']

64−

65− if 'seeders' in result:

66− new_result['seed'] = result['seeders']

67−

68− if 'leechers' in result:

69− new_result['leech'] = result['leechers']

70−

71− if 'downloadUrl' in result:

72− new_result['torrentfile'] = result['downloadUrl']

73−

74− # magnet link *may* be in guid, but it may be also idential to infoUrl

75− if 'guid' in result and isinstance(result['guid'], str) and result['guid'].startswith('magnet'):

76− new_result['magnetlink'] = result['guid']

77−

78− results.append(new_result)

79−

80− return results

searx/engines/qwant.py+1−1

@@ -59,7 +59,7 @@ category_to_keyword = {

5959}

6060

6161# search-url

62−url = 'https://api.qwant.com/v3/search/{keyword}?{query}&count={count}&offset={offset}'

62+url = 'https://api.qwant.com/v3/search/{keyword}?q={query}&count={count}&offset={offset}'

6363

6464

6565def request(query, params):

searx/engines/startpage.py+20−100

@@ -1,30 +1,16 @@

11# SPDX-License-Identifier: AGPL-3.0-or-later

2−# lint: pylint

3−"""Startpage (Web)

4−

2+"""

3+ Startpage (Web)

54"""

6+from lxml import html

7+from dateutil import parser

8+from datetime import datetime, timedelta

79import re

8−from time import time

9−

10−from urllib.parse import urlencode

1110from unicodedata import normalize, combining

12−from datetime import datetime, timedelta

13−

14−from dateutil import parser

15−from lxml import html

1611from babel import Locale

1712from babel.localedata import locale_identifiers

18−

19−from searx import logger

20−from searx.network import get

2113from searx.utils import extract_text, eval_xpath, match_language

22−from searx.exceptions import (

23− SearxEngineResponseException,

24− SearxEngineCaptchaException,

25−)

26−

27−logger = logger.getChild('startpage')

2814

2915# about

3016about = {

@@ -47,7 +33,7 @@ supported_languages_url = 'https://www.startpage.com/do/settings'

4733

4834# search-url

4935base_url = 'https://startpage.com/'

50−search_url = base_url + 'sp/search?'

36+search_url = base_url + 'do/search'

5137

5238# specific xpath variables

5339# ads xpath //div[@id="results"]/div[@id="sponsored"]//div[@class="result"]

@@ -56,74 +42,18 @@ results_xpath = '//div[@class="w-gl__result__main"]'

5642link_xpath = './/a[@class="w-gl__result-title result-link"]'

5743content_xpath = './/p[@class="w-gl__description"]'

5844

59−# timestamp of the last fetch of 'sc' code

60−sc_code_ts = 0

61−sc_code = ''

62−

63−

64−def raise_captcha(resp):

65−

66− if str(resp.url).startswith('https://www.startpage.com/sp/captcha'):

67− # suspend CAPTCHA for 7 days

68− raise SearxEngineCaptchaException(suspended_time=7 * 24 * 3600)

69−

70−

71−def get_sc_code(headers):

72− """Get an actual `sc` argument from startpage's home page.

73−

74− Startpage puts a `sc` argument on every link. Without this argument

75− startpage considers the request is from a bot. We do not know what is

76− encoded in the value of the `sc` argument, but it seems to be a kind of a

77− *time-stamp*. This *time-stamp* is valid for a few hours.

78−

79− This function scrap a new *time-stamp* from startpage's home page every hour

80− (3000 sec).

81−

82− """

83−

84− global sc_code_ts, sc_code # pylint: disable=global-statement

85−

86− if time() > (sc_code_ts + 3000):

87− logger.debug("query new sc time-stamp ...")

88−

89− resp = get(base_url, headers=headers)

90− raise_captcha(resp)

91− dom = html.fromstring(resp.text)

92−

93− try:

94− # href --> '/?sc=adrKJMgF8xwp20'

95− href = eval_xpath(dom, '//a[@class="footer-home__logo"]')[0].get('href')

96− except IndexError as exc:

97− # suspend startpage API --> https://github.com/searxng/searxng/pull/695

98− raise SearxEngineResponseException(

99− suspended_time=7 * 24 * 3600, message="PR-695: query new sc time-stamp failed!"

100− ) from exc

101−

102− sc_code = href[5:]

103− sc_code_ts = time()

104− logger.debug("new value is: %s", sc_code)

105−

106− return sc_code

107−

10845

10946# do search-request

11047def request(query, params):

11148

112− # pylint: disable=line-too-long

113− # The format string from Startpage's FFox add-on [1]::

114− #

115− # https://www.startpage.com/do/dsearch?query={searchTerms}&cat=web&pl=ext-ff&language=__MSG_extensionUrlLanguage__&extVersion=1.3.0

116− #

117− # [1] https://addons.mozilla.org/en-US/firefox/addon/startpage-private-search/

118−

119− args = {

49+ params['url'] = search_url

50+ params['method'] = 'POST'

51+ params['data'] = {

12052 'query': query,

12153 'page': params['pageno'],

12254 'cat': 'web',

123− # 'pl': 'ext-ff',

124− # 'extVersion': '1.3.0',

125− # 'abp': "-1",

126− 'sc': get_sc_code(params['headers']),

55+ 'cmd': 'process_search',

56+ 'engine0': 'v1all',

12757 }

12858

12959 # set language if specified

@@ -131,10 +61,9 @@ def request(query, params):

13161 lang_code = match_language(params['language'], supported_languages, fallback=None)

13262 if lang_code:

13363 language_name = supported_languages[lang_code]['alias']

134− args['language'] = language_name

135− args['lui'] = language_name

64+ params['data']['language'] = language_name

65+ params['data']['lui'] = language_name

13666

137− params['url'] = search_url + urlencode(args)

13867 return params

13968

14069

@@ -210,11 +139,10 @@ def response(resp):

210139

211140# get supported languages from their site

212141def _fetch_supported_languages(resp):

213− # startpage's language selector is a mess each option has a displayed name

214− # and a value, either of which may represent the language name in the native

215− # script, the language name in English, an English transliteration of the

216− # native name, the English name of the writing script used by the language,

217− # or occasionally something else entirely.

142+ # startpage's language selector is a mess

143+ # each option has a displayed name and a value, either of which may represent the language name

144+ # in the native script, the language name in English, an English transliteration of the native name,

145+ # the English name of the writing script used by the language, or occasionally something else entirely.

218146

219147 # this cases are so special they need to be hardcoded, a couple of them are mispellings

220148 language_names = {

@@ -228,15 +156,7 @@ def _fetch_supported_languages(resp):

228156 }

229157

230158 # get the English name of every language known by babel

231− language_names.update(

232− {

233− # fmt: off

234− name.lower(): lang_code

235− # pylint: disable=protected-access

236− for lang_code, name in Locale('en')._data['languages'].items()

237− # fmt: on

238− }

239− )

159+ language_names.update({name.lower(): lang_code for lang_code, name in Locale('en')._data['languages'].items()})

240160

241161 # get the native name of every language known by babel

242162 for lang_code in filter(lambda lang_code: lang_code.find('_') == -1, locale_identifiers()):

@@ -261,8 +181,8 @@ def _fetch_supported_languages(resp):

261181 if isinstance(lang_code, str):

262182 supported_languages[lang_code] = {'alias': sp_option_value}

263183 elif isinstance(lang_code, list):

264− for _lc in lang_code:

265− supported_languages[_lc] = {'alias': sp_option_value}

184+ for lc in lang_code:

185+ supported_languages[lc] = {'alias': sp_option_value}

266186 else:

267187 print('Unknown language option in Startpage: {} ({})'.format(sp_option_value, sp_option_text))

268188

searx/engines/tineye.pydeleted−86

@@ -1,86 +0,0 @@

1−"""

2−Tineye - Reverse search images

3−"""

4−

5−from json import loads

6−from urllib.parse import urlencode

7−

8−from datetime import datetime

9−

10−about = {

11− "website": "https://tineye.com",

12− "wikidata_id": "Q2382535",

13− "use_official_api": False,

14− "require_api_key": False,

15− "results": "JSON",

16−}

17−

18−

19−categories = ['images']

20−paging = True

21−

22−safesearch = False

23−

24−

25−base_url = 'https://tineye.com'

26−search_string = '/result_json/?page={page}&{query}'

27−

28−

29−def request(query, params):

30− params['url'] = base_url +\

31− search_string.format(

32− query=urlencode({'url': query}),

33− page=params['pageno'])

34−

35− params['headers'].update({

36− 'Connection': 'keep-alive',

37− 'Accept-Encoding': 'gzip, defalte, br',

38− 'Host': 'tineye.com',

39− 'DNT': '1',

40− 'TE': 'trailers',

41− })

42−

43− return params

44−

45−

46−def response(resp):

47− results = []

48− # Define wanted results

49− json_data = loads(resp.text)

50− number_of_results = json_data['num_matches']

51−

52− for i in json_data['matches']:

53− for i in json_data['matches']:

54− image_format = i['format']

55− width = i['width']

56− height = i['height']

57− thumbnail_src = i['image_url']

58− backlink = i['domains'][0]['backlinks'][0]

59−

60− url = backlink['backlink']

61− source = backlink['url']

62− title = backlink['image_name']

63− img_src = backlink['url']

64−

65− # Get and convert published date

66− api_date = backlink['crawl_date'][:-3]

67− publishedDate = datetime.fromisoformat(api_date)

68−

69− # Append results

70− results.append({

71− 'template': 'images.html',

72− 'url': url,

73− 'thumbnail_src': thumbnail_src,

74− 'source': source,

75− 'title': title,

76− 'img_src': img_src,

77− 'format': image_format,

78− 'widht': width,

79− 'height': height,

80− 'publishedDate': publishedDate,

81− })

82−

83− # Append number of results

84− results.append({'number_of_results': number_of_results})

85−

86− return results

searx/engines/xpath_flex.pydeleted−121

@@ -1,121 +0,0 @@

1−# SPDX-License-Identifier: AGPL-3.0-or-later

2−

3−"""

4− xPath Flex Engine (xpath_flex)

5−

6− Aims to be a more flexible engine that covers xpath use cases for all categories

7− (as it allows to override the result template).

8− The engine configuration expects you to specify a 'field_definition' dictionary with the following properties:

9− * field_name: the template field that should be set by this entry.

10− * xpath: a xpath expression to apply

11− * (optional) single_element: if True, will execute the xpath expression to expect a single node, not a list

12− * (optional) extract: a string specifying an extraction/conversion of the value, the following is supported:

13− "url": extracts an url using base search url

14− "boolean": will convert the value passed to the template to True if the xpath matches any node

15− "boolean_negate": will convert the value passed to the template to True if the xpath does NOT match a node

16− by default, text will be extracted from the found node(s)

17−

18− an example would look like this (for an example shopping site with paging):

19−

20− - name : xpath-flex-example

21− engine : xpath_flex

22− paging : True

23− search_url : https://myl-shopping.site/search?q={query}&p={pageno}

24− template : products.html

25− results_xpath : //div[@class="listing--container"]/div[@class="listing"]/div[contains(@class,"product--box")]

26− field_definition:

27− - field_name: url

28− xpath: (.//a[contains(@class,"product--image")])/@href

29− extract: url

30− - field_name: title

31− xpath: (.//a[contains(@class,"product--image")])/@title

32− - field_name: content

33− xpath: .//div[@class="product--description"]/text()

34− - field_name: price

35− xpath: .//div[@class="product--price"]/span/text()

36− - field_name: thumbnail

37− xpath: substring-before( (.//span[@class="image--media"]/img)/@srcset, ", ")

38− extract: url

39− single_element: True

40− - field_name: has_stock

41− xpath: .//a[contains(@class,"buynow")][not(contains(@class,"is--disabled"))]

42− extract: boolean

43− single_element: True

44−

45−"""

46−

47−from lxml import html

48−from urllib.parse import urlencode

49−from searx import logger

50−from searx.utils import extract_text, extract_url, eval_xpath, eval_xpath_list

51−

52−logger = logger.getChild('xpath_general engine')

53−

54−search_url = None

55−paging = False

56−results_xpath = ''

57−soft_max_redirects = 0

58−template = 'default.html'

59−unresolvable_value = '' # will be set if expression cannot be resolved

60−default_field_settings = {'single_element': False}

61−

62−field_definition = {}

63−

64−# parameters for engines with paging support

65−#

66−# number of results on each page

67−# (only needed if the site requires not a page number, but an offset)

68−page_size = 1

69−# number of the first page (usually 0 or 1)

70−first_page_num = 1

71−

72−

73−def request(query, params):

74− query = urlencode({'q': query})[2:]

75−

76− fp = {'query': query}

77− if paging and search_url.find('{pageno}') >= 0:

78− fp['pageno'] = (params['pageno'] - 1) * page_size + first_page_num

79−

80− params['url'] = search_url.format(**fp)

81− params['query'] = query

82− params['soft_max_redirects'] = soft_max_redirects

83−

84− return params

85−

86−

87−def response(resp):

88− results = []

89− dom = html.fromstring(resp.text)

90−

91− for result in eval_xpath_list(dom, results_xpath):

92−

93− single_result = {

94− 'template': template

95− }

96−

97− for single_field in field_definition:

98− single_field = {**default_field_settings, **single_field}

99− try:

100− if single_field['single_element']:

101− node = eval_xpath(result, single_field['xpath'])

102− else:

103− node = eval_xpath_list(result, single_field['xpath'])

104−

105− if 'extract' in single_field and single_field['extract'] == 'url':

106− value = extract_url(node, search_url)

107− elif 'extract' in single_field and single_field['extract'] == 'boolean':

108− value = (isinstance(node, list) and len(node) > 0)

109− elif 'extract' in single_field and single_field['extract'] == 'boolean_negate':

110− value = (isinstance(node, list) and len(node) < 1)

111− else:

112− value = extract_text(node)

113−

114− single_result[single_field['field_name']] = value

115− except Exception as e:

116− logger.warning('error in resolving field %s:\n%s', single_field['field_name'], e)

117− single_result[single_field['field_name']] = unresolvable_value

118−

119− results.append(single_result)

120−

121− return results

searx/engines/yggtorrent.py+2−2

@@ -37,9 +37,9 @@ cookies = dict()

3737

3838

3939def init(engine_settings=None):

40− global cookies # pylint: disable=global-variable-not-assigned

40+ global cookies

4141 # initial cookies

42− resp = http_get(url, follow_redirects=False)

42+ resp = http_get(url, allow_redirects=False)

4343 if resp.ok:

4444 for r in resp.history:

4545 cookies.update(r.cookies)

searx/network/__init__.py+27−26

@@ -4,8 +4,6 @@ import asyncio

44import threading

55import concurrent.futures

66from time import time

7−from queue import SimpleQueue

8−from types import MethodType

108import httpx

119import h2.exceptions

@@ -14,6 +12,29 @@ from .network import get_network, initialize, check_network_configuration

1412from .client import get_loop

1513from .raise_for_httperror import raise_for_httperror

1614

15+# queue.SimpleQueue: Support Python 3.6

16+try:

17+ from queue import SimpleQueue

18+except ImportError:

19+ from queue import Empty

20+ from collections import deque

21+

22+ class SimpleQueue:

23+ """Minimal backport of queue.SimpleQueue"""

24+

25+ def __init__(self):

26+ self._queue = deque()

27+ self._count = threading.Semaphore(0)

28+

29+ def put(self, item):

30+ self._queue.append(item)

31+ self._count.release()

32+

33+ def get(self):

34+ if not self._count.acquire(True):

35+ raise Empty

36+ return self._queue.popleft()

37+

1738

1839THREADLOCAL = threading.local()

1940

@@ -101,17 +122,17 @@ def request(method, url, **kwargs):

101122

102123

103124def get(url, **kwargs):

104− kwargs.setdefault('follow_redirects', True)

125+ kwargs.setdefault('allow_redirects', True)

105126 return request('get', url, **kwargs)

106127

107128

108129def options(url, **kwargs):

109− kwargs.setdefault('follow_redirects', True)

130+ kwargs.setdefault('allow_redirects', True)

110131 return request('options', url, **kwargs)

111132

112133

113134def head(url, **kwargs):

114− kwargs.setdefault('follow_redirects', False)

135+ kwargs.setdefault('allow_redirects', False)

115136 return request('head', url, **kwargs)

116137

117138

@@ -135,27 +156,15 @@ async def stream_chunk_to_queue(network, q, method, url, **kwargs):

135156 try:

136157 async with await network.stream(method, url, **kwargs) as response:

137158 q.put(response)

138− # aiter_raw: access the raw bytes on the response without applying any HTTP content decoding

139− # https://www.python-httpx.org/quickstart/#streaming-responses

140159 async for chunk in response.aiter_bytes(65536):

141160 if len(chunk) > 0:

142161 q.put(chunk)

143− except httpx.ResponseClosed as e:

144− # the response was closed

145− pass

146162 except (httpx.HTTPError, OSError, h2.exceptions.ProtocolError) as e:

147163 q.put(e)

148164 finally:

149165 q.put(None)

150166

151167

152−def _close_response_method(self):

153− asyncio.run_coroutine_threadsafe(

154− self.aclose(),

155− get_loop()

156− )

157−

158−

159168def stream(method, url, **kwargs):

160169 """Replace httpx.stream.

161170

@@ -171,18 +180,10 @@ def stream(method, url, **kwargs):

171180 q = SimpleQueue()

172181 future = asyncio.run_coroutine_threadsafe(stream_chunk_to_queue(get_network(), q, method, url, **kwargs),

173182 get_loop())

174− # yield response

175− response = q.get()

176− if isinstance(response, Exception):

177− raise response

178− response.close = MethodType(_close_response_method, response)

179− yield response

180−

181− # yield chunks

182183 chunk_or_exception = q.get()

183184 while chunk_or_exception is not None:

184185 if isinstance(chunk_or_exception, Exception):

185186 raise chunk_or_exception

186187 yield chunk_or_exception

187188 chunk_or_exception = q.get()

188− future.result()

189+ return future.result()

searx/network/client.py+23−14

@@ -3,7 +3,6 @@

33import asyncio

44import logging

55import threading

6−import uvloop

87import httpcore

98import httpx

@@ -18,20 +17,30 @@ import python_socks._errors

1817

1918from searx import logger

2019

20+# Optional uvloop (support Python 3.6)

21+try:

22+ import uvloop

23+except ImportError:

24+ pass

25+else:

26+ uvloop.install()

27+

2128

2229logger = logger.getChild('searx.http.client')

2330LOOP = None

2431SSLCONTEXTS = {}

2532TRANSPORT_KWARGS = {

33+ 'backend': 'asyncio',

2634 'trust_env': False,

2735}

2836

2937

30−async def close_connections_for_url(connection_pool: httpcore.AsyncConnectionPool, url: httpx._models.URL):

31− logger.debug('Drop connections for %r', url.host)

32− connections_to_close = [conn for conn in connection_pool._pool if conn._origin == url.host]

38+async def close_connections_for_url(connection_pool: httpcore.AsyncConnectionPool, url: httpcore._utils.URL):

39+ origin = httpcore._utils.url_to_origin(url)

40+ logger.debug('Drop connections for %r', origin)

41+ connections_to_close = connection_pool._connections_for_origin(origin)

3342 for connection in connections_to_close:

34− connection_pool._pool.remove(connection)

43+ await connection_pool._remove_from_pool(connection)

3544 try:

3645 await connection.aclose()

3746 except httpx.NetworkError as e:

@@ -67,12 +76,12 @@ class AsyncProxyTransportFixed(AsyncProxyTransport):

6776 Note: AsyncProxyTransport inherit from AsyncConnectionPool

6877 """

6978

70− async def handle_async_request(self, request: httpx.Request):

79+ async def handle_async_request(self, method, url, headers=None, stream=None, extensions=None):

7180 retry = 2

7281 while retry > 0:

7382 retry -= 1

7483 try:

75− return await super().handle_async_request(request)

84+ return await super().handle_async_request(method, url, headers, stream, extensions)

7685 except (ProxyConnectionError, ProxyTimeoutError, ProxyError) as e:

7786 raise httpx.ProxyError(e)

7887 except OSError as e:

@@ -80,25 +89,25 @@ class AsyncProxyTransportFixed(AsyncProxyTransport):

8089 raise httpx.NetworkError(e)

8190 except httpx.RemoteProtocolError as e:

8291 # in case of httpx.RemoteProtocolError: Server disconnected

83− await close_connections_for_url(self, request.url)

92+ await close_connections_for_url(self, url)

8493 logger.warning('httpx.RemoteProtocolError: retry', exc_info=e)

8594 # retry

8695 except (httpx.NetworkError, httpx.ProtocolError) as e:

8796 # httpx.WriteError on HTTP/2 connection leaves a new opened stream

8897 # then each new request creates a new stream and raise the same WriteError

89− await close_connections_for_url(self, request.url)

98+ await close_connections_for_url(self, url)

9099 raise e

91100

92101

93102class AsyncHTTPTransportFixed(httpx.AsyncHTTPTransport):

94103 """Fix httpx.AsyncHTTPTransport"""

95104

96− async def handle_async_request(self, request: httpx.Request):

105+ async def handle_async_request(self, method, url, headers=None, stream=None, extensions=None):

97106 retry = 2

98107 while retry > 0:

99108 retry -= 1

100109 try:

101− return await super().handle_async_request(request)

110+ return await super().handle_async_request(method, url, headers, stream, extensions)

102111 except OSError as e:

103112 # socket.gaierror when DNS resolution fails

104113 raise httpx.ConnectError(e)

@@ -106,16 +115,16 @@ class AsyncHTTPTransportFixed(httpx.AsyncHTTPTransport):

106115 # httpx.CloseError: [Errno 104] Connection reset by peer

107116 # raised by _keepalive_sweep()

108117 # from https://github.com/encode/httpcore/blob/4b662b5c42378a61e54d673b4c949420102379f5/httpcore/_backends/asyncio.py#L198 # noqa

109− await close_connections_for_url(self._pool, request.url)

118+ await close_connections_for_url(self._pool, url)

110119 logger.warning('httpx.CloseError: retry', exc_info=e)

111120 # retry

112121 except httpx.RemoteProtocolError as e:

113122 # in case of httpx.RemoteProtocolError: Server disconnected

114− await close_connections_for_url(self._pool, request.url)

123+ await close_connections_for_url(self._pool, url)

115124 logger.warning('httpx.RemoteProtocolError: retry', exc_info=e)

116125 # retry

117126 except (httpx.ProtocolError, httpx.NetworkError) as e:

118− await close_connections_for_url(self._pool, request.url)

127+ await close_connections_for_url(self._pool, url)

119128 raise e

120129

121130

searx/network/network.py−8

@@ -326,14 +326,6 @@ def initialize(settings_engines=None, settings_outgoing=None):

326326 if isinstance(network, str):

327327 NETWORKS[engine_name] = NETWORKS[network]

328328

329− # the /image_proxy endpoint has a dedicated network.

330− # same parameters than the default network, but HTTP/2 is disabled.

331− # It decreases the CPU load average, and the total time is more or less the same

332− if 'image_proxy' not in NETWORKS:

333− image_proxy_params = default_params.copy()

334− image_proxy_params['enable_http2'] = False

335− NETWORKS['image_proxy'] = new_network(image_proxy_params)

336−

337329

338330@atexit.register

339331def done():

searx/results.py+2−8

@@ -6,7 +6,6 @@ from urllib.parse import urlparse, unquote

66from searx import logger

77from searx.engines import engines

88from searx.metrology.error_recorder import record_error

9−from searx.utils import add_scheme_to_url

109from searx import settings

1110

1211

@@ -241,15 +240,10 @@ class ResultContainer:

241240 result['parsed_url'] = urlparse(result['url'])

242241

243242 # if the result has no scheme, use http as default

244− if not result['parsed_url'].scheme or result['parsed_url'].scheme == '':

245− result['parsed_url'] = result['parsed_url']._replace(scheme='http')

243+ if not result['parsed_url'].scheme:

244+ result['parsed_url'] = result['parsed_url']._replace(scheme="http")

246245 result['url'] = result['parsed_url'].geturl()

247246

248− if 'thumbnail_src' in result:

249− result['thumbnail_src'] = add_scheme_to_url(result['thumbnail_src'])

250− if 'img_src' in result:

251− result['img_src'] = add_scheme_to_url(result['img_src'])

252−

253247 result['engines'] = set([result['engine']])

254248

255249 # strip multiple spaces and cariage returns from content

searx/search/checker/impl.py+1−1

@@ -76,7 +76,7 @@ def _is_url_image(image_url):

7676 a = time()

7777 try:

7878 network.set_timeout_for_thread(10.0, time())

79− r = network.get(image_url, timeout=10.0, follow_redirects=True, headers={

79+ r = network.get(image_url, timeout=10.0, allow_redirects=True, headers={

8080 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:84.0) Gecko/20100101 Firefox/84.0',

8181 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',

8282 'Accept-Language': 'en-US;q=0.5,en;q=0.3',

searx/search/processors/online.py+3−4

@@ -69,10 +69,9 @@ class OnlineProcessor(EngineProcessor):

6969 if max_redirects:

7070 request_args['max_redirects'] = max_redirects

7171

72− # follow_redirects

73− if 'follow_redirects' in params:

74− # httpx has renamed this parameter to 'follow_redirects'

75− request_args['follow_redirects'] = params['follow_redirects']

72+ # allow_redirects

73+ if 'allow_redirects' in params:

74+ request_args['allow_redirects'] = params['allow_redirects']

7675

7776 # soft_max_redirects

7877 soft_max_redirects = params.get('soft_max_redirects', max_redirects or 0)

searx/settings.yml+14−44

@@ -410,13 +410,6 @@ engines:

410410 timeout: 3.0

411411 disabled : True

412412

413− - name : tineye

414− engine : tineye

415− shortcut : tin

416− paging : True

417− timeout : 9.0

418− disabled : True

419−

420413 - name : etools

421414 engine : etools

422415 shortcut : eto

@@ -505,13 +498,6 @@ engines:

505498 engine : gigablast

506499 shortcut : gb

507500 timeout : 3.0

508− # Collection names to search in, separated by whitespaces.

509− # By default searx, queries the main collection.

510− #collections: main

511− # Search types, not required. possible values: images, news

512− #search_type: images

513− # Enable fast to get results quicker.

514− #fast : 1

515501 disabled: True

516502 additional_tests:

517503 rosebud: *test_rosebud

@@ -697,19 +683,22 @@ engines:

697683

698684 - name : hoogle

699685 engine : xpath

686+ paging : True

700687 search_url : https://hoogle.haskell.org/?hoogle={query}&start={pageno}

701688 results_xpath : '//div[@class="result"]'

702− title_xpath : './div[@class="ans"]'

703− url_xpath : './div[@class="ans"]//a/@href'

704− content_xpath : './div[contains(@class, "doc")]'

689+ title_xpath : './/div[@class="ans"]//a'

690+ url_xpath : './/div[@class="ans"]//a/@href'

691+ content_xpath : './/div[@class="from"]'

692+ page_size : 20

705693 categories : it

706694 shortcut : ho

707695 about:

708− website: https://hoogle.haskell.org/

696+ website: https://www.haskell.org/

709697 wikidata_id: Q34010

698+ official_api_documentation: https://hackage.haskell.org/api

710699 use_official_api: false

711700 require_api_key: false

712− results: HTML

701+ results: JSON

713702

714703 - name : imdb

715704 engine : imdb

@@ -919,26 +908,6 @@ engines:

919908 engine : openstreetmap

920909 shortcut : osm

921910

922−# - name : prowlarr

923−# engine : prowlarr

924−# shortcut : prow

925−# categories : files

926−# enable_http : True

927−# api_key : ''

928−# indexer_ids : 5 # comma separated list of indexer ids

929−# search_categories : '' # comma separated list of categories

930−# search_type : search

931−# base_url: http://localhost:9696/api/v1/search?

932−# timeout : 50.0

933−# disabled : True,

934−# about :

935−# website : https://wiki.servarr.com/prowlarr

936−# wikidata_id : None

937−# official_api_documentation : https://wiki.servarr.com/prowlarr/search

938−# use_official_api : true

939−# require_api_key : true

940−# results : JSON

941−

942911 - name : openrepos

943912 engine : xpath

944913 paging : True

@@ -1481,10 +1450,10 @@ engines:

14811450 engine : xpath

14821451 paging : True

14831452 search_url : https://petalsearch.com/search?query={query}&pn={pageno}

1484− title_xpath : //span[@class="title-name"]

1485− url_xpath : //div[@class="card-source"]/text()

1486− content_xpath : //span[@class="desc-cont"]

1487− suggestion_xpath : //*[@class="rs-text"]/*[contains(class, rs-text)]

1453+ results_xpath : //div[@class="container"]/div[@class="container"]

1454+ title_xpath : .//a[@class="title"]

1455+ url_xpath : .//a[@class="title"]/@href

1456+ content_xpath : .//div[@class="webpage-text"]

14881457 page_size : 12

14891458 categories : general

14901459 timeout : 4.0

@@ -1656,7 +1625,8 @@ engines:

16561625 - name: onesearch

16571626 shortcut: onesearch

16581627 engine: onesearch

1659− disabled: True

1628+ paging: true

1629+ categories: general

16601630 about:

16611631 website: https://www.onesearch.com/

16621632 wikidata_id: None

searx/templates/oscar/result_templates/products.html+1−2

@@ -1,4 +1,4 @@

1−{% from 'oscar/macros.html' import draw_favicon, icon, result_header, result_sub_header, result_footer_rtl, result_footer %}

1+{% from 'oscar/macros.html' import draw_favicon, result_header, result_sub_header, result_footer_rtl, result_footer %}

33{{ result_header(result, favicons) }}

44{{ result_sub_header(result) }}

@@ -11,7 +11,6 @@

1111 {% if result.shipping %}<small>{{ result.shipping|safe }}</small></br>{% endif %}

1212 {% if result.source_country %}<small>{{ result.source_country|safe }}</small></br>{% endif %}

1313 {% if result.content %}{{ result.content|safe }}{% endif %}

14− {% if result.has_stock is defined %}<br>{% if result.has_stock %}{{ icon('check', _('Has stock')) }}{% else %}{{ icon('alert', _('Out of stock')) }}{% endif %}{% endif %}

1514 </p>

1615 </div>

1716</div>

searx/utils.py+6−12

@@ -7,7 +7,7 @@ from numbers import Number

77from os.path import splitext, join

88from random import choice

99from html.parser import HTMLParser

10−from urllib.parse import urljoin, urlparse, urlunparse

10+from urllib.parse import urljoin, urlparse

1111

1212from lxml import html

1313from lxml.etree import ElementBase, XPath, XPathError, XPathSyntaxError, _ElementStringResult, _ElementUnicodeResult

@@ -214,16 +214,6 @@ def normalize_url(url, base_url):

214214 return url

215215

216216

217−def add_scheme_to_url(url, scheme="https"):

218− """Add schema to URL: if scheme is missing from the URL, then add it."""

219−

220− parsed = urlparse(url)

221− if parsed.scheme == '':

222− parsed_with_scheme = parsed._replace(scheme=scheme)

223− return urlunparse(parsed_with_scheme)

224− return url

225−

226−

227217def extract_url(xpath_results, base_url):

228218 """Extract and normalize URL from lxml Element

229219

@@ -272,7 +262,11 @@ def dict_subset(d, properties):

272262 >>> >> dict_subset({'A': 'a', 'B': 'b', 'C': 'c'}, ['A', 'D'])

273263 {'A': 'a'}

274264 """

275− return {k: d[k] for k in properties if k in d}

265+ result = {}

266+ for k in properties:

267+ if k in d:

268+ result[k] = d[k]

269+ return result

276270

277271

278272def get_torrent_size(filesize, filesize_multiplier):

searx/webapp.py+14−42

@@ -94,7 +94,7 @@ from searx.plugins import plugins

9494from searx.plugins.oa_doi_rewrite import get_doi_resolver

9595from searx.preferences import Preferences, ValidationException, LANGUAGE_CODES

9696from searx.answerers import answerers

97−from searx.network import stream as http_stream, set_context_network_name

97+from searx.network import stream as http_stream

9898from searx.answerers import ask

9999from searx.metrology.error_recorder import errors_per_engines

100100from searx.settings_loader import get_default_settings_path

@@ -921,8 +921,6 @@ def _is_selected_language_supported(engine, preferences):

921921

922922@app.route('/image_proxy', methods=['GET'])

923923def image_proxy():

924− # pylint: disable=too-many-return-statements, too-many-branches

925−

926924 url = request.args.get('url')

927925

928926 if not url:

@@ -934,23 +932,16 @@ def image_proxy():

934932 return '', 400

935933

936934 maximum_size = 5 * 1024 * 1024

937− forward_resp = False

938− resp = None

935+

939936 try:

940− request_headers = {

941− 'User-Agent': gen_useragent(),

942− 'Accept': 'image/webp,*/*',

943− 'Accept-Encoding': 'gzip, deflate',

944− 'Sec-GPC': '1',

945− 'DNT': '1',

946− }

947− set_context_network_name('image_proxy')

937+ headers = dict_subset(request.headers, {'If-Modified-Since', 'If-None-Match'})

938+ headers['User-Agent'] = gen_useragent()

948939 stream = http_stream(

949940 method='GET',

950941 url=url,

951− headers=request_headers,

942+ headers=headers,

952943 timeout=settings['outgoing']['request_timeout'],

953− follow_redirects=True,

944+ allow_redirects=True,

954945 max_redirects=20)

955946

956947 resp = next(stream)

@@ -958,37 +949,25 @@ def image_proxy():

958949 if content_length and content_length.isdigit() and int(content_length) > maximum_size:

959950 return 'Max size', 400

960951

952+ if resp.status_code == 304:

953+ return '', resp.status_code

954+

961955 if resp.status_code != 200:

962956 logger.debug('image-proxy: wrong response code: {0}'.format(resp.status_code))

963957 if resp.status_code >= 400:

964958 return '', resp.status_code

965959 return '', 400

966960

967− if not resp.headers.get('Content-Type', '').startswith('image/'):

968− logger.debug('image-proxy: wrong content-type: %s', resp.headers.get('Content-Type', ''))

961+ if not resp.headers.get('content-type', '').startswith('image/'):

962+ logger.debug('image-proxy: wrong content-type: {0}'.format(resp.headers.get('content-type')))

969963 return '', 400

970964

971− forward_resp = True

972− except httpx.HTTPError:

973− logger.exception('HTTP error')

974− return '', 400

975− finally:

976− if resp and not forward_resp:

977− # the code is about to return an HTTP 400 error to the browser

978− # we make sure to close the response between searxng and the HTTP server

979− try:

980− resp.close()

981− except httpx.HTTPError:

982− logger.exception('HTTP error on closing')

965+ headers = dict_subset(resp.headers, {'Content-Length', 'Length', 'Date', 'Last-Modified', 'Expires', 'Etag'})

983966

984− try:

985− headers = dict_subset(

986− resp.headers,

987− {'Content-Type', 'Content-Encoding', 'Content-Length', 'Length'}

988− )

967+ total_length = 0

989968

990969 def forward_chunk():

991− total_length = 0

970+ nonlocal total_length

992971 for chunk in stream:

993972 total_length += len(chunk)

994973 if total_length > maximum_size:

@@ -1169,13 +1148,6 @@ def run():

11691148 )

11701149

11711150

1172−def patch_application(app):

1173− # serve pages with HTTP/1.1

1174− WSGIRequestHandler.protocol_version = "HTTP/{}".format(settings['server']['http_protocol_version'])

1175− # patch app to handle non root url-s behind proxy & wsgi

1176− app.wsgi_app = ReverseProxyPathFix(ProxyFix(app.wsgi_app))

1177−

1178−

11791151class ReverseProxyPathFix:

11801152 '''Wrap the application in this middleware and configure the

11811153 front-end server to add these headers, to let you quietly bind

tests/unit/test_external_bangs.py+6

@@ -72,26 +72,31 @@ class TestResolveBangDefinition(SearxTestCase):

7272class TestGetBangDefinitionAndAutocomplete(SearxTestCase):

7373

7474 def test_found(self):

75+ global TEST_DB

7576 bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('exam', external_bangs_db=TEST_DB)

7677 self.assertEqual(bang_definition, TEST_DB['trie']['exam']['*'])

7778 self.assertEqual(new_autocomplete, ['example'])

7879

7980 def test_found_optimized(self):

81+ global TEST_DB

8082 bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('example', external_bangs_db=TEST_DB)

8183 self.assertEqual(bang_definition, TEST_DB['trie']['exam']['ple'])

8284 self.assertEqual(new_autocomplete, [])

8385

8486 def test_partial(self):

87+ global TEST_DB

8588 bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('examp', external_bangs_db=TEST_DB)

8689 self.assertEqual(bang_definition, None)

8790 self.assertEqual(new_autocomplete, ['example'])

8891

8992 def test_partial2(self):

93+ global TEST_DB

9094 bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('sea', external_bangs_db=TEST_DB)

9195 self.assertEqual(bang_definition, TEST_DB['trie']['sea']['*'])

9296 self.assertEqual(new_autocomplete, ['search', 'searching', 'seascapes', 'season'])

9397

9498 def test_error(self):

99+ global TEST_DB

95100 bang_definition, new_autocomplete = get_bang_definition_and_autocomplete('error', external_bangs_db=TEST_DB)

96101 self.assertEqual(bang_definition, None)

97102 self.assertEqual(new_autocomplete, [])

@@ -109,6 +114,7 @@ class TestExternalBangJson(SearxTestCase):

109114 self.assertEqual(result, None)

110115

111116 def test_get_bang_url(self):

117+ global TEST_DB

112118 url = get_bang_url(SearchQuery('test', engineref_list=[], external_bang='example'), external_bangs_db=TEST_DB)

113119 self.assertEqual(url, 'https://example.com/test')

114120

utils/searx.sh+1−1

@@ -418,7 +418,7 @@ install_settings() {

418418 err_msg "you have to install searx first"

419419 exit 42

420420 fi

421− mkdir -p "$(dirname "${SEARX_SETTINGS_PATH}")"

421+ mkdir -p "$(dirname ${SEARX_SETTINGS_PATH})"

422422

423423 if [[ ! -f ${SEARX_SETTINGS_PATH} ]]; then

424424 info_msg "install settings ${SEARX_SETTINGS_TEMPLATE}"