From cb17e0702ecb0f9f336cccb650320182aa00e7dd Mon Sep 17 00:00:00 2001
From: henrypp <sforce5@mail.ru>
Date: Sun, 20 Nov 2016 13:35:14 +0600
Subject: [PATCH] 1.3.6 released

---
 .gitattributes                  |   7 +++++++
 CHANGELOG.md                    |   8 ++++++++
 bin/History.txt                 |   8 ++++++++
 bin/i18n/!example.txt           | Bin 11048 -> 11112 bytes
 bin/i18n/Farsi.ini              | Bin 10784 -> 10848 bytes
 bin/i18n/Korean.ini             | Bin 8550 -> 8614 bytes
 bin/i18n/Russian.ini            | Bin 12128 -> 12186 bytes
 bin/i18n/Simplified Chinese.ini | Bin 7632 -> 7696 bytes
 bin/rules.xml                   |   6 +++---
 src/main.cpp                    | Bin 289446 -> 295096 bytes
 src/main.h                      | Bin 48134 -> 48220 bytes
 src/resource.rc                 | Bin 32312 -> 32376 bytes
 12 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..21aba384
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,7 @@
+*.c diff
+*.cpp diff
+*.h diff
+*.rc diff
+*.ini diff
+*.txt diff
+*.xml diff
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64695927..18ae9591 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+v1.3.6 (20 November 2016)
++ added loopback permission for boot-time filters
++ added ip:port syntax for special rules
++ added default values for new special rules
+- fixed restore listview selection
+- fixed special rules crash on delete item
+- fixed log path unexpand environment strings
+
 v1.3.5 (17 November 2016)
 - fixed configuration saving (critical)
 - fixed xml saving (critical)
diff --git a/bin/History.txt b/bin/History.txt
index 64695927..18ae9591 100644
--- a/bin/History.txt
+++ b/bin/History.txt
@@ -1,3 +1,11 @@
+v1.3.6 (20 November 2016)
++ added loopback permission for boot-time filters
++ added ip:port syntax for special rules
++ added default values for new special rules
+- fixed restore listview selection
+- fixed special rules crash on delete item
+- fixed log path unexpand environment strings
+
 v1.3.5 (17 November 2016)
 - fixed configuration saving (critical)
 - fixed xml saving (critical)
diff --git a/bin/i18n/!example.txt b/bin/i18n/!example.txt
index f62ae797cbd2c86a245e383d62730f21114033af..4e8b04b7e75a05c364cc13fd29452a8eb91939b2 100644
GIT binary patch
delta 38
rcmZ1x_9AS<G7-jt$-bh}llerYSo0Z*7)n4qRx1Vz27}E9MbgCp^t=lW

delta 18
acmaD6wjyl9G7-jr$qz-OH#3Q*i2(pj)CS=I

diff --git a/bin/i18n/Farsi.ini b/bin/i18n/Farsi.ini
index 8a66a5a0b098db2043a3cdf18ca60e8efa2163da..8aec05faf8a300c7545a59e91dbf850af7960ee8 100644
GIT binary patch
delta 51
zcmZ1w@*reGk%)vRLjZ#ULpehxLkU9$kX68t&rk$pPYw`~VzpwhU@(|$FDkydL1cj_
E09kYlg8%>k

delta 16
YcmaD5vLIwbk;vo@QNGOwL>7nw06<U%*#H0l

diff --git a/bin/i18n/Korean.ini b/bin/i18n/Korean.ini
index 8798c655a7cb0ba0dea3a869f55fe5e7a9d5dbd7..fbe115bf557f1a9c8ec108edec314500b34f7a53 100644
GIT binary patch
delta 47
zcmaFnw9I*filBriLjZ#ULpehxLkU9$kX68t&rk$pPc{&gVzpwhU@+J$E$A%(02USs
AH~;_u

delta 12
TcmZ4H{LE>Cis0rHK_>wKBD(}}

diff --git a/bin/i18n/Russian.ini b/bin/i18n/Russian.ini
index 54e72fb5c07e7c0ec1bf82db82f0008fc536162a..75a31cf4d2b77f363acc96a4af0b7a8562f478de 100644
GIT binary patch
delta 41
wcmaD5H!FTal7x^aLjZ#Ug9VEMgFTBKivx=j%VY-$DOM{63kHMDkrM3U0Mnlch5!Hn

delta 16
YcmbOg{~&HdlEmZ)NukZ_B;JSt06!oG^8f$<

diff --git a/bin/i18n/Simplified Chinese.ini b/bin/i18n/Simplified Chinese.ini
index 4e724da5569747cec41c949c0e7911947f773f2f..11491ae64bd8aa0c97940f083a41be33c9190140 100644
GIT binary patch
delta 42
ycmca$J;7#!gn+ODLpehxLkU9$g91YVLq0<hL&@Zi{L-ve3>FLqo4Ey!@&W+suL^kp

delta 12
TcmbPWbHRFpguvzqfgQX6Ag2V7

diff --git a/bin/rules.xml b/bin/rules.xml
index dfebe43e..44ebfe3c 100644
--- a/bin/rules.xml
+++ b/bin/rules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <root>
-	<item name="SSH" rule="22" direction="0" is_block="0" is_enabled="0" />
-	<item name="Google" rule="176.222.187.0/24,173.194.0.0/16" direction="0" is_block="1" is_enabled="0" />
-	<item name="Eset NOD32" rule="91.228.166.0/23" direction="0" is_block="0" is_enabled="0" />
+	<item name="google" rule="176.222.187.0/24,173.194.0.0/16" direction="0" is_block="1" is_enabled="0" />
+	<item name="ssh port" rule="22" direction="0" is_block="0" is_enabled="0" />
+	<item name="nod32 updates" rule="91.228.166.0/23" direction="0" is_block="0" is_enabled="0" />
 </root>
diff --git a/src/main.cpp b/src/main.cpp
index fd76e6effd41eeeefb4f9d0d4fe24019d3d29a48..78e46f5b32e14b2ac5cc50cf531424a76b489923 100644
GIT binary patch
delta 2172
zcmb7F4NOy46uv*tQc5kg)B>f!2Wp3kS{b^@2w~`=+YnLIs55|nM5bcrI(5+~Vq{J?
zhCPH67o#O1#<<0FXne?+7Gs<tYDk>SZN^n4GcmL4OtzT0xSdu6WU_2&-tE2joO8eL
z{M>VoTpQ84)8fyok}BH<hu4pqT*6*s^VuTyI-5bWOr|m?t74VCGdJ_Fjcg*zV{W#A
zW}XvEsyc=z#<GQEP{bCn7g-jW^a^2TeFC(8X~Wbeu7mm=+4$)yZah)7EkBNzV8<<)
z2+e602<%HrR9OZa%id+<Sb7wyiY;gB+3FLIKG-k+tL}IE?kiY&jvJx;RUPJz75cPZ
zB1EZ@RnWMcZKAJ|t)p=TjjOR~D^K+9)<bop6;kUmA-|>o57i1CRDV(kT{THh7t=u9
zWr<zRR?%-Gn*=*LlEEFX#Pqv50gjwi;iFa?s&DgYgGi?g;b6pBxO^%R-1|Erbk+#w
zb|d&2=c8)jCMXYBpnaDf>UX9N6r_U>^<Z`x;Ko^fLK*o}MXXk{Efl`t%)nydR!u@5
zv$@{2aA}+gjyDuQ^#&t6Za4+zt3}=ee?stTIXrZlz}#3f0NgzYvlOo+aO?lXd=rA5
zc2H}SLD<dS3l%K~d>b)qDj$O<<G2}a|E1#RTlplsG*P<XXy$lSw{ZnryUkeF#%&l@
z_(Q1K?7($7JOit52p!h9acgA%Ao?fsVk{cZEwE>^4UN-zCWJ3$qN?Ltu-?i&&ogwz
z@Mg?U=1Zf(XKWz+tr?Hy^1}Wz|B1R6>$CZ?K^ox<Zr6Nq{CW(A?+QJ-YRJDnkIIA6
zs1;LAc^{_cPT&VQnqs&S{Zo{zLCRr@`4i<R0rM(_3JaydTbrl3NAg2rC>SJ|mgmGJ
zf|tW1ey<n`6bZDgKQd2&9q3-DSTI<um@x2@uz=fSezv|-wZ(Scm;wb$Y-pIy9a?BA
zZ(TdmP1nrB*08c@aYj~Ds9Hx8pBx7N13eZd%Srgy$CL1=S5#<=yyE06tW$&?yS|W1
z(SJvnu`o^Q@n(`-f&NyJgyGX7J0dV@Gk*~GC<w-A_(VPiv!xAPaa0}ZH>B8pQ&ixX
zZZQUreI?RiZ;tU<;ZpqhM`0Wm?QD2!mXeIF25CSwC_=nai@zn3Ij=<ef5+=J!<q9s
z^xqbZv~{>xq@e2sMTfp_F&m3jX~FJ0<Vg6AaKO42J^E%)uELL`qSf^XRfnlvoJhT;
zShe<hVy5U{BdwhYtJr4ho*s(PdR9Wcb2VFuO_%s6bkxw%7w(It5mrtt`kl%ueKfad
zxgk+%A2yXuVOcODD-DD3G8elpk+}G4p`ayJdY>PA<U))FbBa!Ln`MY=-End|$KweD
z%}13{gDWE*PjmMkWi8TNdh^$J1_ol}8|a9a4gFL!qS7WKCoaPr6VZ2BWi#qV%1QA3
z$40ESOB1RgYOh^Y20Zg21w8*EU2%VcRM6MKRje2(7dKv@c)2o2cxIF^;mOn7jKvpe
z&$N=F9^Os$v1eJN7Tcu`{I$xnLbCdeQ1ZiMKx!(6?g|6e*<}E_>~^eHr2|5r+3<=@
zs_44R6%5;CD+YcM4h$qpJ8X}m=4v-$z$E9R`wywpvXbN`j^Xp9+p<PvVcvb=Y_v-c
zIGiT*S>=-*Jl7*q(f2FWCZW~I0eLPgQx-p|+PYL((R<YKd*n#<15psEp*pPX7D*6J
z(KV*YR{9p;(RqqJ-W7cgSJG=6NrMNk%~PhL(;>6L<upKfycL5zVvSawF2#h{h*}lB
zq8_bmjx6DL9i$xtMRF59UM_Wb6Udiob7hejpt*CN>^K*_bXu`hX&`P?xLA5dz6|a;
udhG0>`{sH@NyW~Wi0<MP#iRvo$_m2}1xA<qee6zCZvKm0n>|`7o%J___sjbL

delta 1486
zcmaJ>e{54#6u$SKyYkpdDa|%(SIXNDSSPG2A~+jt#*`n<I4el9EJR8i6DF3ofyfBp
zFofVju;WTULdY_V5!A($4EN9wGmIf<jG0jp2^r%L6Jv-z4Fp1nc)MjNCi2%i=X>XV
z_nh;cb5HH^z4ybkY&<o24l~&-mSXGGuFwMmZ>LUAQR%HN)#x(@(%bhGsFA%DXt>P1
zs&22Jmkn&(+e7zYd1Xvfs53i?;J-j_I48JoAiZx;Ds#7ld!~rr6VA)j4fV6?KA2Md
z8K1hf%d72f<y~Q@$f4MP2e*X=lJJ&ux9U1P5itgs%AGMLLX`(umH4SuIU^I;RqY4R
zMZ8vdj~3>B3=H-zXt)3J^9z%Zt>g{1rfuN3^ry(j@G==x*|*}#nde6$#FwbX^ejYY
z@InlSxT!u$KWz6_@{@e*WG<m!a@^}wI_6T*MIoeT$%mBX@!nIP-BH7jl-PAo^HVRE
zq}WE*!Cql&*ao(qZDVWMYG!F~Gh2r%wX)ORWAnk^QGZ;t+Ria?aw$gIxd-MsYDVHw
z^4n2Iyi0jGiQ3eeQ!8O!6Nh;lO1~3}GuK6$x7j_{MG@D~nH!=V{u|=B#<V>>hh4rY
zI`!xEYoZ38Wug#Y2g%Rd)YRQY=$$EDNVdsf!Frv}TAifHO7ZM5QI14}41DlCg^`_4
zKE!LZd$@=DFnmOq%G&Hk;u~6kL`)cV*DcYShkcVM@Ufd}1yUbUKKjDsS4%#rM^hgK
zuoF~_FIG#xa!OnnzC{wLL*&IdLCq@Ko{z{8(hWWBMxoG=b%I>>PNMpNYH6-eR<#SG
z(`od+z5KR}sxV~gtCP!Ry{ZdHSZ1z><uW?v>3@Fvof&jaAbCd=t4nj;Q&YO?*ZvVi
zt!b{DxXpNCGE0o>#8&FvSj@JL>6T(G+D@@8Y=v%Ght@R3USgYc>%tSd=9WRDni{2@
zygYB*Jkdc#=&zzeB=X1w>%4db(dlFq+>K_danz(4u;x+|V&&BP@9OLE*@NWHg!OvG
zg2Io+5c%xw6||7X${8mes-)*tcg&NcScT+sT3;)y2Px7iD`0j?555XhL<JAztFFgg
z_$|Q8&{{=JnF8IZks3OW(fJfqv1~EAXOoHk+4L!frjQ?R%%Q-+ox%+>Obxj0Bg6Jo
zlf}o?juyy9T#V3WI3>c1L>14sHQj#7jfDp<yegZJ{X@9zU*}OP&w;CQgSDSp*j7w4
zbj{`zok8eL-ILtVBfEfFkj+pKi8h^j-69J8cj{_M%(nNxNC}RsJM<+tTWE{DZ7nql
z^d;q!D!Iw9&2`lA`Q3#&i!MiRKwYUcV1{HZth2%er%Z;?cZcE#U*sNTerf#wIxJMy
zGX@Uz==Z^TOvd3vr5hWHb(%v{Wf0C4J?qXK>B$t!<uIQTaSSbzt^@CDK?X&>?Nm!^
i@_naRzX&_fTFt!}?cfp-Ap<aLW&iyS+4|6rOaBHIaN;%q

diff --git a/src/main.h b/src/main.h
index 99652cf368add2a9465b79884e4e7bfdb8765c03..5945cbc412fec56c46ddfa52887c7b44fe228e23 100644
GIT binary patch
delta 80
zcmZqs!F1;b(*_>KiJL@(6B%+C(i!p@iWo8(N*FR2avAI<vol_0G@HDTQFk&IlMtiX
jW?80{N`k=*9t{2rK@1@b3Je7x4U->=i*G)n;xruqsu~tK

delta 47
zcmccfgQ@KY(*_>K$rg+km`xd!CN_#rR$$U#HD%CYFo1A4HfJ$)C~cNeb(jtSaL^7M

diff --git a/src/resource.rc b/src/resource.rc
index 1d8a2381a068c16dbd1a7629c926f8f49806d126..512a0d6bc32740c760cd07a8279ef05cec078ea1 100644
GIT binary patch
delta 40
ucmdn-hw;ZB#tmZej0KbT#!FAGi<e@}XDDJQ0r6O^7%UhJHXFvX%L4#Wk`2iK

delta 20
ccmezIhjGUr#tmZei~*Aa<E1wj#k0u+0A?EqC;$Ke