[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-09-05 Thread translation 
commit 17ad4ee57ae35ea89d1b3114992091de41ae8918
Author: Translation commit bot 
Date:   Thu Sep 6 02:16:02 2018 +

Update translations for tails-misc
---
 es.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/es.po b/es.po
index 818873693..4e717fb70 100644
--- a/es.po
+++ b/es.po
@@ -10,6 +10,7 @@
 # eulalio barbero espinosa , 2018
 # Jose Luis Tirado , 2014-2015
 # Manuel Herrera , 2013
+# simranjit singh, 2018
 # strel, 2013-2018
 # Zuhualime Akoochimoya, 2018
 msgid ""
@@ -17,8 +18,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-04 11:37+0200\n"
-"PO-Revision-Date: 2018-09-04 14:30+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-09-06 02:15+\n"
+"Last-Translator: simranjit singh\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -710,13 +711,13 @@ msgstr "Para iniciar una terminal de root necesitas 
acreditarte."
 
 #: 
../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:1
 msgid "Remove an additional software package"
-msgstr ""
+msgstr "Retirar un paquete de software adicional"
 
 #: 
../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:2
 msgid ""
 "Authentication is required to remove a package from your additional software"
 " ($(command_line))"
-msgstr ""
+msgstr "Se requiere autenticación para quitar un paquete de su software 
adicional ($ (command_line))"
 
 #: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:61
 msgid "File Containers"
@@ -738,7 +739,7 @@ msgstr "Particiones y unidades"
 msgid ""
 "This application is not affiliated with or endorsed by the VeraCrypt project"
 " or IDRIX."
-msgstr ""
+msgstr "Esta aplicación no está afiliada o endosado por el proyecto 
VeraCrypt o IDRIX."
 
 #: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in:38
 msgid "Lock this volume"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Bug 27480: Add win64 to the stable downloads page

2018-09-05 Thread boklm 
commit 66a9a7146edad1d2528c1ee0ef5ae7323f93a872
Author: Nicolas Vigier 
Date:   Thu Sep 6 01:44:29 2018 +0200

Bug 27480: Add win64 to the stable downloads page
---
 include/versions.wmi   |   2 +
 projects/en/torbrowser.wml | 237 ++---
 2 files changed, 181 insertions(+), 58 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index d55a83ed..57cc3ab8 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -12,6 +12,8 @@
 # version-torbrowserbundle-all and releasedate-torbrowserbundle-all
 
 
+
+
 
 
 
diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index be5e74cb..a7c407a2 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -90,8 +90,13 @@
   
 
   English (en-US)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -101,8 +106,13 @@
 
 

(ar)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -112,8 +122,13 @@
 
 
   Català (ca)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -123,8 +138,13 @@
 
 
   Dansk (da)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -134,8 +154,13 @@
 
 
   Deutsch (de)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -145,12 +170,15 @@
 
 

(es-ES)
-  32/64-bit
-  (sig)
-  64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
+  64-bit
+  (sig)
   32-bit
   (sig)
64-bit
@@ -158,8 +186,13 @@
 
 
(fa)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -169,8 +202,13 @@
 
 

(fr)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -180,8 +218,13 @@
 
 
   Gaeilge (Irish) (ga-IE)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -191,8 +234,13 @@
 
 
(he)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -202,8 +250,13 @@
 
 
   bahasa Indonesia (id)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -213,8 +266,13 @@
 
 
   íslenska (is)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -224,8 +282,13 @@
 
 
   Italiano (it)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -235,8 +298,13 @@
 
 
(ja)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -246,8 +314,13 @@
 
 
   Korean

[tor-commits] [webwml/staging] Bug 27480: Add win64 to the stable downloads page

2018-09-05 Thread boklm 
commit 96588533c1ecb91f5d603e93f8903b0e2aee127c
Author: Nicolas Vigier 
Date:   Thu Sep 6 01:44:29 2018 +0200

Bug 27480: Add win64 to the stable downloads page
---
 include/versions.wmi   |   2 +
 projects/en/torbrowser.wml | 234 ++---
 2 files changed, 178 insertions(+), 58 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index d81f3dff..0bd169ae 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -17,6 +17,8 @@
 # version-torbrowserbundle-all and releasedate-torbrowserbundle-all
 
 
+
+
 
 
 
diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index be5e74cb..3926cae1 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -90,8 +90,10 @@
   
 
   English (en-US)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -101,8 +103,13 @@
 
 

(ar)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -112,8 +119,13 @@
 
 
   Català (ca)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -123,8 +135,13 @@
 
 
   Dansk (da)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -134,8 +151,13 @@
 
 
   Deutsch (de)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -145,12 +167,15 @@
 
 

(es-ES)
-  32/64-bit
-  (sig)
-  64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
+  64-bit
+  (sig)
   32-bit
   (sig)
64-bit
@@ -158,8 +183,13 @@
 
 
(fa)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -169,8 +199,13 @@
 
 

(fr)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -180,8 +215,13 @@
 
 
   Gaeilge (Irish) (ga-IE)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -191,8 +231,13 @@
 
 
(he)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -202,8 +247,13 @@
 
 
   bahasa Indonesia (id)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -213,8 +263,13 @@
 
 
   íslenska (is)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -224,8 +279,13 @@
 
 
   Italiano (it)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -235,8 +295,13 @@
 
 
(ja)
-  32/64-bit
-  (sig)
+  
+32/64-bit
+(sig)
+
+64-bit
+(sig)
+  
   64-bit
   (sig)
   32-bit
@@ -246,8 +311,13 @@
 
 
   Korean (ko)
-  32/64-bit
-  (sig)
+  
+

[tor-commits] [webwml/staging] Merge branch 'master' into staging

2018-09-05 Thread boklm 
commit fb08e8a0f261727b2a90fbb563e854b4f58bdb80
Merge: b9ee58ae b26ed3a3
Author: Nicolas Vigier 
Date:   Thu Sep 6 01:43:54 2018 +0200

Merge branch 'master' into staging

 css/layout.css |   3 -
 css/layout.min.css |   2 +-
 include/lang.wmi   |   9 ++
 include/versions.wmi   |  10 +-
 projects/en/torbrowser.wml | 180 -
 projects/torbrowser/RecommendedTBBVersions |  10 +-
 6 files changed, 124 insertions(+), 90 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Bug 27433: add new locales to stable downloads

2018-09-05 Thread boklm 
commit b26ed3a3805b1cc1d2d2b7a7c0defc72d0e2704f
Author: Nicolas Vigier 
Date:   Wed Sep 5 21:21:46 2018 +0200

Bug 27433: add new locales to stable downloads

Add ca, da, ga-IE, he, id, is, nb-NO, sv-SE, zh-TW locales to stable
downloads.
---
 include/lang.wmi   |   9 
 projects/en/torbrowser.wml | 100 +
 2 files changed, 109 insertions(+)

diff --git a/include/lang.wmi b/include/lang.wmi
index fee392a0..92c397b3 100644
--- a/include/lang.wmi
+++ b/include/lang.wmi
@@ -7,17 +7,26 @@
 
  English
  
+ Català
+ Dansk
  Deutsch
  espaol
  
  
+ Gaeilge (Irish)
+ 
+ bahasa Indonesia
+ íslenska
  Italiano
   
  Korean
+ Norsk bokmål
  Nederlands
  Polish
  
  
+ Svenska
  Trke
  Vietnamese
  
+ 
diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index 1b5270e0..be5e74cb 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -110,6 +110,28 @@
64-bit
   (sig)
 
+
+  Català (ca)
+  32/64-bit
+  (sig)
+  64-bit
+  (sig)
+  32-bit
+  (sig)
+   64-bit
+  (sig)
+
+
+  Dansk (da)
+  32/64-bit
+  (sig)
+  64-bit
+  (sig)
+  32-bit
+  (sig)
+   64-bit
+  (sig)
+
 
   Deutsch (de)
   32/64-bit
@@ -156,6 +178,50 @@
64-bit
   (sig)
 
+
+  Gaeilge (Irish) (ga-IE)
+  32/64-bit
+  (sig)
+  64-bit
+  (sig)
+  32-bit
+  (sig)
+   64-bit
+  (sig)
+
+
+   (he)
+  32/64-bit
+  (sig)
+  64-bit
+  (sig)
+  32-bit
+  (sig)
+   64-bit
+  (sig)
+
+
+  bahasa Indonesia (id)
+  32/64-bit
+  (sig)
+  64-bit
+  (sig)
+  32-bit
+  (sig)
+   64-bit
+  (sig)
+
+
+  íslenska (is)
+  32/64-bit
+  (sig)
+  64-bit
+  (sig)
+  32-bit
+  (sig)
+   64-bit
+  (sig)
+
 
   Italiano (it)
   32/64-bit
@@ -189,6 +255,17 @@
64-bit
   (sig)
 
+
+  Norsk bokmål (nb-NO)
+  32/64-bit
+  (sig)
+  64-bit
+  (sig)
+  32-bit
+  (sig)
+   64-bit
+  (sig)
+
 
   Nederlands (nl)
   32/64-bit
@@ -234,6 +311,18 @@
64-bit
   (sig)
 
+
+  Svenska (sv-SE)
+  32/64-bit
+  (sig)
+  64-bit
+  (sig)
+  32-bit
+  (sig)
+   64-bit
+  (sig)
+
 
   Trke (tr)
   32/64-bit
@@ -267,6 +356,17 @@
64-bit
   (sig)
 
+
+   (zh-TW)
+  32/64-bit
+  (sig)
+  64-bit
+  (sig)
+  32-bit
+  (sig)
+   64-bit
+  (sig)
+
   
 
   



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Remove some commented lines in projects/en/torbrowser.wml

2018-09-05 Thread boklm 
commit df62baa02a33c9c916960ed17f104dc3e42a9a69
Author: Nicolas Vigier 
Date:   Wed Sep 5 20:52:18 2018 +0200

Remove some commented lines in projects/en/torbrowser.wml
---
 projects/en/torbrowser.wml | 80 --
 1 file changed, 80 deletions(-)

diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index 91cc778c..1b5270e0 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -94,8 +94,6 @@
   (sig)
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -107,8 +105,6 @@
   (sig)
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -120,8 +116,6 @@
   (sig)
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -135,8 +129,6 @@
   
href="../dist/torbrowser//TorBrowser--osx64_es-ES.dmg">64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -148,8 +140,6 @@
   (sig)
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -161,8 +151,6 @@
   (sig)
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -174,8 +162,6 @@
   (sig)
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -187,8 +173,6 @@
   (sig)
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -200,8 +184,6 @@
   (sig)
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -213,8 +195,6 @@
   (sig)
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -226,8 +206,6 @@
   (sig)
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -239,8 +217,6 @@
   (sig)
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -253,8 +229,6 @@
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -266,8 +240,6 @@
   (sig)
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -279,8 +251,6 @@
   (sig)
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -292,8 +262,6 @@
   (sig)
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -337,8 +305,6 @@
   
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -355,8 +321,6 @@
   
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -373,8 +337,6 @@
   
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -391,8 +353,6 @@
   
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -409,8 +369,6 @@
   
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -427,8 +385,6 @@
   
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -445,8 +401,6 @@
   
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -463,8 +417,6 @@
   
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -481,8 +433,6 @@
   
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -499,8 +449,6 @@
   
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -517,8 +465,6 @@
   
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -535,8 +481,6 @@
   
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -553,8 +497,6 @@
   
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -589,8 +531,6 @@
   
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -607,8 +547,6 @@
   
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -625,8 +563,6 @@
   
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -643,8 +579,6 @@
   
   64-bit
   (sig)
-  
   32-bit
   (sig)
64-bit
@@ -661,8 +595,6 @@
   
   64-bit

[tor-commits] [webwml/staging] Add new Tor Browser version: 8.0

2018-09-05 Thread boklm 
commit e4b92bb8a6f60dd54711bdeab2034b6fd1a94f35
Author: Nicolas Vigier 
Date:   Wed Sep 5 18:18:33 2018 +0200

Add new Tor Browser version: 8.0
---
 include/versions.wmi   | 6 +++---
 projects/torbrowser/RecommendedTBBVersions | 4 
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index b0ae6963..e1a95600 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -4,9 +4,9 @@
 maint-7.5
 
 # *** tor browser stable ***
-7.5.6
-2018-06-26
-0.3.3.7
+8.0
+2018-09-05
+0.3.3.9
 
 # If all platforms are on the same version, you only need to update
 # version-torbrowserbundle-all and releasedate-torbrowserbundle-all
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 7b0b4f0c..65034a01 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -3,6 +3,10 @@
 "7.5.6-MacOS",
 "7.5.6-Linux",
 "7.5.6-Windows",
+"8.0",
+"8.0-MacOS",
+"8.0-Linux",
+"8.0-Windows",
 "8.0a9",
 "8.0a9-MacOS",
 "8.0a9-Linux",



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Add new Tor Browser version: 8.5a1

2018-09-05 Thread boklm 
commit 2093e66ccc256d8c14ad045ca58f71ae302097bf
Author: Nicolas Vigier 
Date:   Wed Sep 5 18:20:21 2018 +0200

Add new Tor Browser version: 8.5a1
---
 include/versions.wmi   | 4 ++--
 projects/torbrowser/RecommendedTBBVersions | 6 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index e1a95600..d55a83ed 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -24,8 +24,8 @@
 ../dist/torbrowser//tor-win32-.zip
 
 # *** tor browser beta/alpha ***
-8.0a10
-2018-08-20
+8.5a1
+2018-09-05
 
 # If all platforms are on the same version, you only need to update
 # version-torbrowserbundlebeta-all and releasedate-torbrowserbundlebeta-all
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 65034a01..6697e097 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -14,5 +14,9 @@
 "8.0a10",
 "8.0a10-MacOS",
 "8.0a10-Linux",
-"8.0a10-Windows"
+"8.0a10-Windows",
+"8.5a1",
+"8.5a1-MacOS",
+"8.5a1-Linux",
+"8.5a1-Windows"
 ]



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Revert "css: wrap text on higher zoom levels (#22076)"

2018-09-05 Thread boklm 
commit da4db986ea33e18bc9eebc6784e7d5dbdd752bf3
Author: hiro 
Date:   Wed Sep 5 16:46:08 2018 +0200

Revert "css: wrap text on higher zoom levels (#22076)"

This reverts commit 0756fda8eb80ca08b2d1cf4a455da7681cdf0b29.
---
 css/layout.css | 3 ---
 css/layout.min.css | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/css/layout.css b/css/layout.css
index b037bfcf..0db489c8 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -9,7 +9,6 @@ body {
 
 #wrap {
width: 960px;
-max-width: 100%;
margin: 0 auto;
 }
 
@@ -225,7 +224,6 @@ body {
 
 #content {
width: 960px;
-   max-width: 100%;
 }
 
#content img { max-width: 710px; }
@@ -241,7 +239,6 @@ body {
#maincol {
float: right;
width: 710px;
-max-width: 75%;
margin-bottom: 20px;
}
 
diff --git a/css/layout.min.css b/css/layout.min.css
index 8bb4ef45..fee5575d 100644
--- a/css/layout.min.css
+++ b/css/layout.min.css
@@ -1 +1 @@
-@charset 
"UTF-8";body{background:#fff}#wrap{width:960px;max-width:100%;margin:0 
auto}.left{float:left}.right{float:right}.twenty{width:20%}.thirty{width:30%}.forty{width:40%}.fifty{width:50%}.sixty{width:60%}.hundred{width:100%}.nopad{padding:0}.toppad{padding-top:10px}.toptwenty{margin-top:20px}.topforty{margin-top:40px}.hidden{display:none}#header{width:960px;height:97px;margin-bottom:23px;position:relative}h1#logo{margin:0;float:left}h1#logo
 a,h1#logo a:visited{background:url(../images/tor-logo.png) left top 
no-repeat;background-size:150px 
97px;text-indent:-px;overflow:hidden;width:150px;height:97px;display:block}#nav{position:absolute;top:30px;left:115px;float:right}#nav
 ul{height:50px;float:right;margin-bottom:0}#nav ul 
li{float:left;display:inline;width:auto}#calltoaction{height:30px;float:right;margin-top:100px;margin-right:5px;text-align:center}#calltoaction
 ul{padding:0;margin:0;height:30px;list-style:none;float:right}#calltoaction ul 
li{list-style:none;display:inline;f
 loat:none;width:100px;margin-left:0}#calltoaction ul li a:link,#calltoaction 
ul li a:visited{display:block;background:url(../images/cta-buttons.jpg) top 
center no-repeat #885ca4;padding:4px 
8px;color:#fff;font-weight:bold;text-decoration:none;font-size:13px;line-height:22px;height:22px;width:84px;float:left;text-shadow:1px
 1px 0 #111}#calltoaction ul li:hover 
a{background:url(../images/cta-buttons.jpg) bottom center no-repeat 
#ff9800;font-weight:bold;text-shadow:1px 1px 0 #111}#calltoaction ul 
li:first-child a:link,#calltoaction ul li:first-child a:visited,#calltoaction 
ul li:hover:first-child 
a{-webkit-border-top-left-radius:7px;-webkit-border-bottom-left-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-bottomleft:7px;border-top-left-radius:7px;border-bottom-left-radius:7px}#calltoaction
 ul li:first-child a:link,#calltoaction ul li:first-child 
a:visited{background:url(../images/cta-buttons.jpg) top left no-repeat 
#885ca4}#calltoaction ul li:hover:first-child a{backgroun
 d:url(../images/cta-buttons.jpg) bottom left no-repeat #ff9800}#calltoaction 
ul li:last-child a:link,#calltoaction ul li:last-child a:visited,#calltoaction 
ul li:hover:last-child 
a{-webkit-border-top-right-radius:7px;-webkit-border-bottom-right-radius:7px;-moz-border-radius-topright:7px;-moz-border-radius-bottomright:7px;border-top-right-radius:7px;border-bottom-right-radius:7px}#calltoaction
 ul li:last-child a:link,#calltoaction ul li:last-child 
a:visited{background:url(../images/cta-buttons.jpg) top right no-repeat 
#885ca4;color:#fff}#calltoaction ul li:hover:last-child 
a{background:url(../images/cta-buttons.jpg) bottom right no-repeat 
#ff9800}#banner{background:url(../images/bg-banner.jpg) left top 
no-repeat;height:200px;width:600px;padding:23px 
15px;margin-bottom:15px}#download a:link,#download a:visited{margin:-17px 0 
0;background:url(../images/button-download.png) left top 
no-repeat;width:257px;height:79px;float:left;padding:35px 0 0 
80px;text-decoration:none}#download a .down
 load-tor{background:url(../images/button-download-arrow.png) right center 
no-repeat;font-family:"Arial 
Narrow",Arial,sans-serif;color:#fff;font-size:2.167em;letter-spacing:1px;padding-right:25px}#download
 a .version{color:#bda5cc;font-size:1.167em;line-height:1.167em}#download a 
.info{color:#bda5cc;font-size:.833em;line-height:.833em}#download 
a:hover{background-position:0 -114px}#download a:hover .version,#download 
a:hover .info{color:#f1c6a1}#banner ul{background:#387520 
url(../images/banner-gradient.jpg) left top repeat-x;border:1px solid 
#366b32;width:180px;float:right;margin:0 15px 0 0;padding:10px 10px 10px 
30px}#banner ul li{list-style:url(../images/white-bullet.png) 
outside;padding:5px 0}#content{width:960px;max-width:100%}#content 
img{max-width:710px}#breadcrumbs{padding:0 0 10px 5px}#home

[tor-commits] [tor/master] Backport to older NSS, which does not have SEC_DerSignDataWithAlgorithmID

2018-09-05 Thread nickm 
commit b8a2bdbdc8c467762f1bb0c2d103c566fe9703a7
Author: Nick Mathewson 
Date:   Wed Sep 5 16:49:15 2018 -0400

Backport to older NSS, which does not have SEC_DerSignDataWithAlgorithmID
---
 src/lib/tls/x509_nss.c | 8 
 1 file changed, 8 insertions(+)

diff --git a/src/lib/tls/x509_nss.c b/src/lib/tls/x509_nss.c
index 5bb7940c9..a0a9c559c 100644
--- a/src/lib/tls/x509_nss.c
+++ b/src/lib/tls/x509_nss.c
@@ -114,11 +114,19 @@ tor_tls_create_certificate_internal(crypto_pk_t *rsa,
   if (!tmp)
 goto err;
 
+#if 0
   s = SEC_DerSignDataWithAlgorithmID(cert->arena,
  _der,
  der.data, der.len,
  (SECKEYPrivateKey *)signing_key,//const
  >signature);
+#else
+  s = SEC_DerSignData(cert->arena,
+  _der,
+  der.data, der.len,
+  (SECKEYPrivateKey *)signing_key,//const
+  SEC_OID_PKCS1_SHA256_WITH_RSA_ENCRYPTION);
+#endif
 
   if (s != SECSuccess)
 goto err;

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Fix checkspaces

2018-09-05 Thread nickm 
commit 5656144290754254f2b10dfc941a652c4c2ba1e4
Author: Nick Mathewson 
Date:   Wed Sep 5 16:48:53 2018 -0400

Fix checkspaces
---
 src/lib/crypt_ops/crypto_util.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/crypt_ops/crypto_util.c b/src/lib/crypt_ops/crypto_util.c
index 42024907e..64b4e6b71 100644
--- a/src/lib/crypt_ops/crypto_util.c
+++ b/src/lib/crypt_ops/crypto_util.c
@@ -95,7 +95,7 @@ memwipe(void *mem, uint8_t byte, size_t sz)
   OPENSSL_cleanse(mem, sz);
 #else
   memset(mem, 0, sz);
-  asm volatile ("" ::: "memory");
+  asm volatile("" ::: "memory");
 #endif /* defined(SecureZeroMemory) || defined(HAVE_SECUREZEROMEMORY) || ... */
 
   /* Just in case some caller of memwipe() is relying on getting a buffer
@@ -108,5 +108,4 @@ memwipe(void *mem, uint8_t byte, size_t sz)
* if somebody accidentally calls memwipe() instead of memset().
**/
   memset(mem, byte, sz);
-
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Suppress strict-prototypes warnings in one more batch of NSS headers

2018-09-05 Thread nickm 
commit 710aa122e4a011435a64e5ccddc0e898ede1f231
Author: Nick Mathewson 
Date:   Wed Sep 5 16:36:18 2018 -0400

Suppress strict-prototypes warnings in one more batch of NSS headers
---
 src/lib/tls/tortls_nss.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c
index 8e6c0d2d7..53adfedf3 100644
--- a/src/lib/tls/tortls_nss.c
+++ b/src/lib/tls/tortls_nss.c
@@ -33,6 +33,7 @@
 #include "lib/tls/tortls_internal.h"
 #include "lib/log/util_bug.h"
 
+DISABLE_GCC_WARNING(strict-prototypes)
 #include 
 // For access to raw sockets.
 #include 
@@ -40,6 +41,7 @@
 #include 
 #include 
 #include 
+ENABLE_GCC_WARNING(strict-prototypes)
 
 static SECStatus always_accept_cert_cb(void *, PRFileDesc *, PRBool, PRBool);
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Add a last-ditch memwipe() implementation for nss+old glibc

2018-09-05 Thread nickm 
commit 8cd091a8d3133e9e5363bc4a673011178e54ab5d
Author: Nick Mathewson 
Date:   Wed Sep 5 16:34:01 2018 -0400

Add a last-ditch memwipe() implementation for nss+old glibc

On new glibc versions, there's an explicit_bzero().  With openssl,
there's openssl_memwipe().

When no other approach works, use memwipe() and a memory barrier.
---
 src/lib/crypt_ops/crypto_util.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/lib/crypt_ops/crypto_util.c b/src/lib/crypt_ops/crypto_util.c
index 7af80291e..42024907e 100644
--- a/src/lib/crypt_ops/crypto_util.c
+++ b/src/lib/crypt_ops/crypto_util.c
@@ -80,7 +80,7 @@ memwipe(void *mem, uint8_t byte, size_t sz)
 #elif defined(HAVE_MEMSET_S)
   /* This is in the C99 standard. */
   memset_s(mem, sz, 0, sz);
-#else
+#elif defined(ENABLE_OPENSSL)
   /* This is a slow and ugly function from OpenSSL that fills 'mem' with junk
* based on the pointer value, then uses that junk to update a global
* variable.  It's an elaborate ruse to trick the compiler into not
@@ -93,6 +93,9 @@ memwipe(void *mem, uint8_t byte, size_t sz)
**/
 
   OPENSSL_cleanse(mem, sz);
+#else
+  memset(mem, 0, sz);
+  asm volatile ("" ::: "memory");
 #endif /* defined(SecureZeroMemory) || defined(HAVE_SECUREZEROMEMORY) || ... */
 
   /* Just in case some caller of memwipe() is relying on getting a buffer
@@ -105,4 +108,5 @@ memwipe(void *mem, uint8_t byte, size_t sz)
* if somebody accidentally calls memwipe() instead of memset().
**/
   memset(mem, byte, sz);
+
 }

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Reword changelog entry about system requirements

2018-09-05 Thread pastly 
commit 56553055692792daf516b9da282cc5183ccdb712
Author: Matt Traudt 
Date:   Wed Sep 5 11:11:21 2018 -0400

Reword changelog entry about system requirements

trac: finishes #26937
---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37b79f7..27795be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,8 +9,7 @@ and this project adheres to [Semantic 
Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-- Add system physical requirements, but do not warn (which requires to make
-  syscalls). (#26937)
+- Add system physical requirements section to INSTALL (#26937)
 
 ### Fixed
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Merge branch 'ticket26937_02' from juga, thanks

2018-09-05 Thread pastly 
commit 75be1aa2060880bd534593d0bc6cd58d5f4db0de
Merge: 5e363d8 a9e4fbd
Author: Matt Traudt 
Date:   Wed Sep 5 11:16:51 2018 -0400

Merge branch 'ticket26937_02' from juga, thanks

 CHANGELOG.md |  6 +-
 INSTALL.rst  | 25 +
 2 files changed, 30 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add system physical requirements

2018-09-05 Thread pastly 
commit 5601e2d891d4a4e7302e127eb3c2e0045c0b066c
Author: juga0 
Date:   Mon Sep 3 12:43:02 2018 +

Add system physical requirements
---
 INSTALL.rst | 25 +
 1 file changed, 25 insertions(+)

diff --git a/INSTALL.rst b/INSTALL.rst
index 3821aaf..9d5c8f5 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -98,6 +98,31 @@ To build the documentation diagrams::
 
 The generated diagrams will be in ``docs/build/_images/``.
 
+System physical requirements
+-
+
+- Bandwidth: at least 20MB/s (160 Mbit/s). The more the better.
+- Free RAM: at least 1.5GB
+- Free disk: at least 3GB
+
+``sbws`` and its dependencies need around 20MB of disk space.
+After 90 days ``sbws`` data files use around 3GB.
+If ``sbws`` is configured to log to files (by default will log to the
+system log), it will need a maximum of 500MB.
+
+It is recommended to set up an automatic disk space monitoring on ``sbws`` data
+and log partitions.
+
+Details about ``sbws`` data:
+
+``sbws`` produces around 100MB of data a day.
+By default raw results' files are compressed after 10 days and deleted after 
90.
+The bandwidth files are compressed after 7 days and deleted after 1.
+After 90 days, the disk space used by the data will be aproximately 3GB.
+It will not increase further.
+If ``sbws`` is configured to log to files, logs will be rotated after they
+are 10MB and it will keep 50 rotated log files.
+
 .. _virtualenv: https://virtualenv.pypa.io/en/stable/installation/
 .. _Stem: https://stem.torproject.org/
 .. _socks: http://docs.python-requests.org/en/master/user/advanced/#socks



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add changelog entry about system physical requirements

2018-09-05 Thread pastly 
commit b329a56e4e741839e6a25dbd913f7b7853c64562
Author: juga0 
Date:   Mon Sep 3 12:45:45 2018 +

Add changelog entry about system physical requirements
---
 CHANGELOG.md | 5 +
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f028b6..37b79f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic 
Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+
+- Add system physical requirements, but do not warn (which requires to make
+  syscalls). (#26937)
+
 ### Fixed
 
 - Broken environment variable in default sbws config. To use envvar $FOO, write



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Use conf.getint and getpath

2018-09-05 Thread pastly 
commit 5e363d8b9bba1225029a2317c0d58673429585e8
Author: Matt Traudt 
Date:   Wed Sep 5 10:56:31 2018 -0400

Use conf.getint and getpath

getpath is necessary so that ~ is expanded

GH: closes #241
trac: implements #26937
---
 sbws/util/fs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sbws/util/fs.py b/sbws/util/fs.py
index 9621b6f..c7a5de7 100644
--- a/sbws/util/fs.py
+++ b/sbws/util/fs.py
@@ -20,7 +20,7 @@ def sbws_required_disk_space(conf):
 # ~1000 is the length of a line when the result is successfull
 # ~4550 is the number of lines of the biggest result file
 size_result_file = 4550 * 1000
-num_result_files = int(conf['general']['data_period'])
+num_result_files = conf.getint('general', 'data_period')
 # not counting compressed files
 space_v3bw_files = size_v3bw_file * num_v3bw_files
 space_result_files = size_result_file * num_result_files
@@ -48,7 +48,7 @@ def is_low_space(conf):
 what is needed for sbws and False otherwise needs.
 """
 disk_required_mb = sbws_required_disk_space(conf)
-disk_avail_mb = df(conf['paths']['sbws_home'])
+disk_avail_mb = df(conf.getpath('paths', 'sbws_home'))
 if disk_avail_mb < disk_required_mb:
 log.warn("The space left on the device (%s MiB) is less than "
  "the minimum recommended to run sbws (%s MiB)."



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Size of log file, no stdout

2018-09-05 Thread pastly 
commit dcc7435aae0d15bbad89aa21161b106cc64388c2
Author: juga0 
Date:   Sat Aug 4 05:13:04 2018 +

Size of log file, no stdout
---
 sbws/util/fs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbws/util/fs.py b/sbws/util/fs.py
index 9e6bc29..9621b6f 100644
--- a/sbws/util/fs.py
+++ b/sbws/util/fs.py
@@ -27,7 +27,7 @@ def sbws_required_disk_space(conf):
 # not counted rotated files and assuming that when it is not rotated the
 # size will be aproximately 10MiB
 size_log_file = conf.getint('logging', 'to_file_max_bytes') or 10485760 \
-if conf.getboolean('logging', 'to_stdout') else 0
+if conf.getboolean('logging', 'to_file') else 0
 # roughly, size of a current tor dir
 space_tor_dir = 19828000
 # duplicate everything to warn early



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Move changelog entry to Unreleased

2018-09-05 Thread pastly 
commit a9e4fbdfcee8f39b3694aee79b17361605029e69
Author: Matt Traudt 
Date:   Wed Sep 5 11:11:45 2018 -0400

Move changelog entry to Unreleased
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27795be..5d0acce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic 
Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 
 - Add system physical requirements section to INSTALL (#26937)
+- Warn when there is not enough disk space (#26937)
 
 ### Fixed
 
@@ -43,7 +44,6 @@ file)
 - Log line on start up with sbws version, platform info, and library versions
 (trac#26751)
 - Manual pages (#26926)
-- Warn when there is not enough disk space (#26937)
 
 ### Fixed
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Use conf.getint and getpath

2018-09-05 Thread pastly 
commit 93e454e2328f2ed427d844c72bcc74cafd34ec52
Author: Matt Traudt 
Date:   Wed Sep 5 10:56:31 2018 -0400

Use conf.getint and getpath

getpath is necessary so that ~ is expanded

GH: closes #241
trac: implements #26937
---
 sbws/util/fs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sbws/util/fs.py b/sbws/util/fs.py
index 9621b6f..c7a5de7 100644
--- a/sbws/util/fs.py
+++ b/sbws/util/fs.py
@@ -20,7 +20,7 @@ def sbws_required_disk_space(conf):
 # ~1000 is the length of a line when the result is successfull
 # ~4550 is the number of lines of the biggest result file
 size_result_file = 4550 * 1000
-num_result_files = int(conf['general']['data_period'])
+num_result_files = conf.getint('general', 'data_period')
 # not counting compressed files
 space_v3bw_files = size_v3bw_file * num_v3bw_files
 space_result_files = size_result_file * num_result_files
@@ -48,7 +48,7 @@ def is_low_space(conf):
 what is needed for sbws and False otherwise needs.
 """
 disk_required_mb = sbws_required_disk_space(conf)
-disk_avail_mb = df(conf['paths']['sbws_home'])
+disk_avail_mb = df(conf.getpath('paths', 'sbws_home'))
 if disk_avail_mb < disk_required_mb:
 log.warn("The space left on the device (%s MiB) is less than "
  "the minimum recommended to run sbws (%s MiB)."



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Revert "Exit on OSError when building circuit"

2018-09-05 Thread pastly 
commit c1a6eb9d21d340e23d725dbb73c3ac52f9c940cb
Author: juga0 
Date:   Sat Aug 4 05:17:53 2018 +

Revert "Exit on OSError when building circuit"

This reverts commit ede9feda3b6285c9e04a162dc393afa5e734d7e3.
An exception trying to write to log file when there is not disk
space can happen anywhere in the code
---
 sbws/core/scanner.py | 11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index 8b13816..fa8cc88 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -201,16 +201,7 @@ def measure_relay(args, conf, destinations, cb, rl, relay):
 our_nick = conf['scanner']['nickname']
 circ_id = cb.build_circuit(circ_fps)
 if not circ_id:
-try:
-log.warning('Could not build circuit involving %s', relay.nickname)
-except OSError as e:
-# if the error is no space left (logging to file system)
-# can not log the error, so print it
-# this can happen in any log call, here would happen when measuring
-# new relay starts
-if e.code == 28:  # No space left on device
-print("ERROR: " + str(e))
-exit(1)
+log.warning('Could not build circuit involving %s', relay.nickname)
 msg = 'Unable to complete circuit'
 return [
 ResultErrorCircuit(relay, circ_fps, dest.url, our_nick, msg=msg),



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Specify the unit is MiB

2018-09-05 Thread pastly 
commit b5002e7e921a04bb32f8f4a0210fbcc58bdfcbcd
Author: juga0 
Date:   Fri Aug 3 12:54:06 2018 +

Specify the unit is MiB
---
 sbws/util/fs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbws/util/fs.py b/sbws/util/fs.py
index 5b48f3b..0f20d0a 100644
--- a/sbws/util/fs.py
+++ b/sbws/util/fs.py
@@ -39,7 +39,7 @@ def sbws_required_disk_space(conf):
 
 
 def df(path):
-"""Return space left on device where path is."""
+"""Return space left on device where path is in MiB."""
 return round(shutil.disk_usage(path).free / (1024 ** 2))
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Check disk space before running generate

2018-09-05 Thread pastly 
commit 7aaf0a5b4342840ae07827d3becfcd45b6351a01
Author: juga0 
Date:   Sun Jul 15 20:37:02 2018 +

Check disk space before running generate
---
 sbws/core/scanner.py | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index 0fe7908..8b13816 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -21,6 +21,9 @@ import logging
 import requests
 import random
 
+from ..util.fs import is_low_space
+
+
 rng = random.SystemRandom()
 end_event = Event()
 log = logging.getLogger(__name__)
@@ -377,6 +380,9 @@ def gen_parser(sub):
 
 
 def main(args, conf):
+if is_low_space(conf):
+exit(1)
+
 if conf.getint('scanner', 'measurement_threads') < 1:
 fail_hard('Number of measurement threads must be larger than 1')
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Fix typo

2018-09-05 Thread pastly 
commit 39cf07040a3e36fcde07b58d9faf982d1a5613af
Author: juga0 
Date:   Fri Aug 3 12:54:26 2018 +

Fix typo
---
 sbws/util/fs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbws/util/fs.py b/sbws/util/fs.py
index 0f20d0a..9e6bc29 100644
--- a/sbws/util/fs.py
+++ b/sbws/util/fs.py
@@ -51,7 +51,7 @@ def is_low_space(conf):
 disk_avail_mb = df(conf['paths']['sbws_home'])
 if disk_avail_mb < disk_required_mb:
 log.warn("The space left on the device (%s MiB) is less than "
- "the minimum recommented to run sbws (%s MiB)."
+ "the minimum recommended to run sbws (%s MiB)."
  "Run sbws cleanup to delete old sbws generated files.",
  disk_avail_mb, disk_required_mb)
 return True



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add unit tests for disk space functions

2018-09-05 Thread pastly 
commit 07140b3433e32906bdeab75a669ded41356ff216
Author: juga0 
Date:   Sun Jul 15 20:35:58 2018 +

Add unit tests for disk space functions
---
 tests/unit/util/test_fs.py | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/tests/unit/util/test_fs.py b/tests/unit/util/test_fs.py
new file mode 100644
index 000..0f4c35a
--- /dev/null
+++ b/tests/unit/util/test_fs.py
@@ -0,0 +1,23 @@
+"""Unit tests for fs module"""
+from unittest.mock import patch
+
+from sbws.util import fs
+
+
+def mock_df_zero(path):
+return 0
+
+
+def mock_df_enough(path):
+return 32
+
+
+@patch('sbws.util.fs.df', mock_df_zero)
+def test_is_low_space_true(caplog, conf):
+assert fs.is_low_space(conf) is True
+assert ' is less than ' in caplog.records[-1].getMessage()
+
+
+@patch('sbws.util.fs.df', mock_df_enough)
+def test_is_low_space_false(conf):
+assert fs.is_low_space(conf) is False



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Revert "Warn when exception might be caused by no disk space"

2018-09-05 Thread pastly 
commit 1da39db2bb46536fa3ef9227f249620859c18b6f
Author: juga0 
Date:   Sat Aug 4 05:17:29 2018 +

Revert "Warn when exception might be caused by no disk space"

This reverts commit 72b45d4d5b5ccd7228ab793012ba7d42084ddfbf.
---
 sbws/lib/circuitbuilder.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sbws/lib/circuitbuilder.py b/sbws/lib/circuitbuilder.py
index 66687b0..e3b3950 100644
--- a/sbws/lib/circuitbuilder.py
+++ b/sbws/lib/circuitbuilder.py
@@ -65,9 +65,7 @@ class CircuitBuilder:
 pass
 self.built_circuits.discard(circ_id)
 except (ControllerError, ValueError) as e:
-log.warning("Error trying to get circuit to close it: %s.", e,
-"If sbws didn't receive SIGHUP, "
-"maybe this system run out of disk space.")
+log.exception("Error trying to get circuit to close it: %s.", e)
 
 def _build_circuit_impl(self, path):
 if not valid_circuit_length(path):



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Update the total

2018-09-05 Thread pastly 
commit a602a54e12f200566751e417ed6614a8900aead2
Author: juga0 
Date:   Fri Aug 3 12:53:39 2018 +

Update the total

and add comment about MiB
---
 sbws/util/fs.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sbws/util/fs.py b/sbws/util/fs.py
index 111e109..5b48f3b 100644
--- a/sbws/util/fs.py
+++ b/sbws/util/fs.py
@@ -31,7 +31,9 @@ def sbws_required_disk_space(conf):
 # roughly, size of a current tor dir
 space_tor_dir = 19828000
 # duplicate everything to warn early
-size_total = (space_v3bw_files + size_log_file + space_result_files) * 2
+size_total = (space_v3bw_files + size_log_file + space_result_files +
+  space_tor_dir) * 2
+# convert to MiB
 size_total_mb = round(size_total / (1024 ** 2))
 return size_total_mb
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Increase space needed in test

2018-09-05 Thread pastly 
commit ec42ff0376dfe99820c9dd290e402bea2fb3aaa0
Author: juga0 
Date:   Fri Aug 3 12:54:48 2018 +

Increase space needed in test
---
 tests/unit/util/test_fs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/util/test_fs.py b/tests/unit/util/test_fs.py
index 0f4c35a..e659d83 100644
--- a/tests/unit/util/test_fs.py
+++ b/tests/unit/util/test_fs.py
@@ -9,7 +9,7 @@ def mock_df_zero(path):
 
 
 def mock_df_enough(path):
-return 32
+return 89
 
 
 @patch('sbws.util.fs.df', mock_df_zero)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add changelog entry about disk space warning

2018-09-05 Thread pastly 
commit 1cc6e19d484980f9057cd2c099df4bafe7ae46d7
Author: juga0 
Date:   Wed Jul 25 23:05:31 2018 +

Add changelog entry about disk space warning
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1de8368..5f028b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@ file)
 - Log line on start up with sbws version, platform info, and library versions
 (trac#26751)
 - Manual pages (#26926)
+- Warn when there is not enough disk space (#26937)
 
 ### Fixed
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Fix syntax

2018-09-05 Thread pastly 
commit bda5d187ca99a5a96ae6b7844b47f4a6f7ce94b0
Author: juga0 
Date:   Wed Aug 29 08:01:04 2018 +

Fix syntax
---
 INSTALL.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 73d960f..962e4ab 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -84,7 +84,7 @@ To build the documentation as HTML::
 
 cd docs/ && make html
 
-The generated HTML will be in `docs/build/`.
+The generated HTML will be in ``docs/build/``.
 
 To build the manual (``man``) pages::
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Calculate space for result files and tor dir

2018-09-05 Thread pastly 
commit d92f85aeef967846f3489d582fd9194ceba13a3a
Author: juga0 
Date:   Fri Aug 3 12:52:05 2018 +

Calculate space for result files and tor dir

also replace conf[''] for conf.getint/conf.getboolean
---
 sbws/util/fs.py | 16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/sbws/util/fs.py b/sbws/util/fs.py
index 45fd468..111e109 100644
--- a/sbws/util/fs.py
+++ b/sbws/util/fs.py
@@ -15,15 +15,21 @@ def sbws_required_disk_space(conf):
 """
 # Number of relays per line average size in Bytes
 size_v3bw_file = 7500 * 220
-num_v3bw_files = int(conf['general']['data_period'])
+# the minimum number of required v3bw files
+num_v3bw_files = 2
+# ~1000 is the length of a line when the result is successfull
+# ~4550 is the number of lines of the biggest result file
+size_result_file = 4550 * 1000
+num_result_files = int(conf['general']['data_period'])
 # not counting compressed files
 space_v3bw_files = size_v3bw_file * num_v3bw_files
+space_result_files = size_result_file * num_result_files
 # not counted rotated files and assuming that when it is not rotated the
 # size will be aproximately 10MiB
-size_log_file = (int(conf['logging']['to_file_max_bytes']) or 10485760) \
-if conf['logging']['to_stdout'] == 'yes' else 0
-# roughly...
-space_result_files = space_v3bw_files
+size_log_file = conf.getint('logging', 'to_file_max_bytes') or 10485760 \
+if conf.getboolean('logging', 'to_stdout') else 0
+# roughly, size of a current tor dir
+space_tor_dir = 19828000
 # duplicate everything to warn early
 size_total = (space_v3bw_files + size_log_file + space_result_files) * 2
 size_total_mb = round(size_total / (1024 ** 2))



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add functions to check disk space

2018-09-05 Thread pastly 
commit 2f39df44fb4b539498cbabe1d072b8c100a7da63
Author: juga0 
Date:   Sun Jul 15 20:35:23 2018 +

Add functions to check disk space
---
 sbws/util/fs.py | 50 ++
 1 file changed, 50 insertions(+)

diff --git a/sbws/util/fs.py b/sbws/util/fs.py
new file mode 100644
index 000..45fd468
--- /dev/null
+++ b/sbws/util/fs.py
@@ -0,0 +1,50 @@
+"""Utils file system functions"""
+
+import logging
+import shutil
+
+log = logging.getLogger(__name__)
+
+
+def sbws_required_disk_space(conf):
+"""Disk space required by sbws files.
+Rough calculations.
+
+:param ConfigParser conf: sbws configuration
+:returns: int, size in MiB
+"""
+# Number of relays per line average size in Bytes
+size_v3bw_file = 7500 * 220
+num_v3bw_files = int(conf['general']['data_period'])
+# not counting compressed files
+space_v3bw_files = size_v3bw_file * num_v3bw_files
+# not counted rotated files and assuming that when it is not rotated the
+# size will be aproximately 10MiB
+size_log_file = (int(conf['logging']['to_file_max_bytes']) or 10485760) \
+if conf['logging']['to_stdout'] == 'yes' else 0
+# roughly...
+space_result_files = space_v3bw_files
+# duplicate everything to warn early
+size_total = (space_v3bw_files + size_log_file + space_result_files) * 2
+size_total_mb = round(size_total / (1024 ** 2))
+return size_total_mb
+
+
+def df(path):
+"""Return space left on device where path is."""
+return round(shutil.disk_usage(path).free / (1024 ** 2))
+
+
+def is_low_space(conf):
+"""Warn and return True when the space left on the device is less than
+what is needed for sbws and False otherwise needs.
+"""
+disk_required_mb = sbws_required_disk_space(conf)
+disk_avail_mb = df(conf['paths']['sbws_home'])
+if disk_avail_mb < disk_required_mb:
+log.warn("The space left on the device (%s MiB) is less than "
+ "the minimum recommented to run sbws (%s MiB)."
+ "Run sbws cleanup to delete old sbws generated files.",
+ disk_avail_mb, disk_required_mb)
+return True
+return False



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Exit on OSError when building circuit

2018-09-05 Thread pastly 
commit 949e67637772597621a6060673270a6df1ecdec4
Author: juga0 
Date:   Sun Jul 15 14:28:13 2018 +

Exit on OSError when building circuit
---
 sbws/core/scanner.py | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index 4e59498..0fe7908 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -198,7 +198,16 @@ def measure_relay(args, conf, destinations, cb, rl, relay):
 our_nick = conf['scanner']['nickname']
 circ_id = cb.build_circuit(circ_fps)
 if not circ_id:
-log.warning('Could not build circuit involving %s', relay.nickname)
+try:
+log.warning('Could not build circuit involving %s', relay.nickname)
+except OSError as e:
+# if the error is no space left (logging to file system)
+# can not log the error, so print it
+# this can happen in any log call, here would happen when measuring
+# new relay starts
+if e.code == 28:  # No space left on device
+print("ERROR: " + str(e))
+exit(1)
 msg = 'Unable to complete circuit'
 return [
 ResultErrorCircuit(relay, circ_fps, dest.url, our_nick, msg=msg),



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Fix syntax

2018-09-05 Thread pastly 
commit f0c873e6cb84c627c0aa6f6706cc4f8890d57c71
Author: juga0 
Date:   Wed Aug 29 08:01:12 2018 +

Fix syntax
---
 INSTALL.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 962e4ab..67540b0 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -90,7 +90,7 @@ To build the manual (``man``) pages::
 
 cd docs/ && make man
 
-The generated man pages will be in `docs/man/`.
+The generated man pages will be in ``docs/man/``.
 
 To build the documentation diagrams::
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Merge branch 'ticket27341'

2018-09-05 Thread pastly 
commit eca0d2685cac7bc20571d3d476eda7fcdf48f0a7
Merge: 48715b7 9239f69
Author: Matt Traudt 
Date:   Wed Sep 5 10:35:31 2018 -0400

Merge branch 'ticket27341'

 CHANGELOG.md |  12 +++
 DEPLOY.rst   |  84 --
 INSTALL.rst  | 198 +++
 README.md|  17 
 docs/source/glossary.rst |  52 +++-
 docs/source/man_sbws.ini.rst |  39 +++--
 docs/source/man_sbws.rst |   6 ++
 7 files changed, 169 insertions(+), 239 deletions(-)

diff --cc CHANGELOG.md
index b760644,f45182e..1de8368
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -7,11 -7,18 +7,23 @@@ and this project adheres to [Semantic V
  
  ## [Unreleased]
  
 +### Fixed
 +
 +- Broken environment variable in default sbws config. To use envvar $FOO, 
write
 +  $$FOO in the config.
 +
+ ### Changed
+ 
+ - sbws install doc is confusing (#27341)
+   - Include system and Python dependencies in `INSTALL`.
+   - Include dependencies for docs and tests in `INSTALL`.
+   - Point to `DEPLOY` to run sbws.
+   - Remove obsolete sections in `INSTALL`
+   - Simplify `DEPLOY`, reuse terms in the `glossary`.
+   - Remove obsolete ``sbws init`` from `DEPLOY`.
+   - Point to config documentation.
+   - Add, unify and reuse terms in `glossary`.
+ 
  ## [0.7.0] - 2018-08-09
  
  **Important changes**:



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] sbws.ini.5 is not automatically build nor installed

2018-09-05 Thread pastly 
commit 48715b7ca361d7e731a08539e24ad97f94d4c47c
Author: juga0 
Date:   Wed Aug 29 08:19:21 2018 +

sbws.ini.5 is not automatically build nor installed

when installing sbws from git.
When there will be a system package, it should be added the
possibility to use man sbws.ini
---
 sbws/lib/destination.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py
index 86d76c7..a8087e2 100644
--- a/sbws/lib/destination.py
+++ b/sbws/lib/destination.py
@@ -235,7 +235,8 @@ class DestinationList:
 conf.getint('scanner', 'max_download_size')))
 if len(dests) < 1:
 msg = 'No enabled destinations in config. Please see '\
-'"man sbws.ini" for help adding and enabling destinations'
+'"docs/source/man_sbws.ini.rst" for help adding and '\
+'enabling destinations'
 return None, msg
 return DestinationList(conf, dests, circuit_builder, relay_list,
controller), ''



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Fix syntax

2018-09-05 Thread pastly 
commit f0cae0f82301345eb31dd9c71acfcef61e82eacc
Author: juga0 
Date:   Wed Aug 29 08:01:52 2018 +

Fix syntax
---
 INSTALL.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 67540b0..85c70b9 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -96,7 +96,7 @@ To build the documentation diagrams::
 
 cd docs/ && make umlsvg
 
-The generated diagrams will be in `docs/build/images/`.
+The generated diagrams will be in ``docs/build/images/``.
 
 .. _virtualenv: https://virtualenv.pypa.io/en/stable/installation/
 .. _Stem: https://stem.torproject.org/



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Clarify which section must be edited

2018-09-05 Thread pastly 
commit abee1767b8dbcebad4edb108baae775676f8bf5f
Author: juga0 
Date:   Wed Aug 29 07:54:31 2018 +

Clarify which section must be edited
---
 docs/source/man_sbws.ini.rst | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst
index 01257ef..1df9639 100644
--- a/docs/source/man_sbws.ini.rst
+++ b/docs/source/man_sbws.ini.rst
@@ -6,6 +6,13 @@ DESCRIPTION
 
 Tor bandwidth scanner configuration file.
 
+**sbws** (1) ``scanner`` command requires a configuration file with a
+"[destinations]" section.
+It is the only section that does not have a default value.
+It is recommended, but not required to configure "nickname" in the "[scanner]"
+section.
+
+
 SECTIONS
 -
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add other paths and remove non-config dir

2018-09-05 Thread pastly 
commit 2dfe05595906d0a742873025f7ada90ef75fe330
Author: juga0 
Date:   Wed Aug 29 07:25:19 2018 +

Add other paths and remove non-config dir
---
 docs/source/man_sbws.ini.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst
index 3ed78e5..01257ef 100644
--- a/docs/source/man_sbws.ini.rst
+++ b/docs/source/man_sbws.ini.rst
@@ -153,9 +153,8 @@ FILES
 $HOME/.sbws.ini
Default ``sbws`` user configuration path.
 
-$HOME/.sbws
-   Default sbws home, where it stores measurement data files,
-   bandwidth list files and tor process data.
+Any other path to the configuration file can be specified using the
+``sbws`` argument ``-c``
 
 SEE ALSO
 -



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] HTTP Server must also support Range requests

2018-09-05 Thread pastly 
commit 6585dc741826b89cf3b0efb705f4f228956fbfba
Author: juga0 
Date:   Wed Aug 29 06:41:53 2018 +

HTTP Server must also support Range requests
---
 DEPLOY.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index 5ed375b..41ff9cd 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -16,8 +16,9 @@ well connected machines.
 :term:`destination` requirements
 
 
-- A Web server installed and running that supports HEAD and GET
-  requests (``apache`` and ``nginx`` fit this description)
+- A Web server installed and running that supports HTTP GET, HEAD and
+  Range (:rfc:`7233`) requests.
+  ``Apache`` HTTP Server and ``Nginx`` support them.
 - Optional support for TLS
 - A large file; at the time of writing, at least 1 GiB in size
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add path to runtime directory

2018-09-05 Thread pastly 
commit 022ce9a68ad5251f7785fa803f626c89503d7627
Author: juga0 
Date:   Wed Aug 29 07:29:48 2018 +

Add path to runtime directory
---
 docs/source/man_sbws.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/source/man_sbws.rst b/docs/source/man_sbws.rst
index 775c7db..7ffb7ba 100644
--- a/docs/source/man_sbws.rst
+++ b/docs/source/man_sbws.rst
@@ -62,6 +62,9 @@ $HOME/.sbws
Default sbws home, where it stores measurement data files,
bandwidth list files and tor process data.
 
+$XDG_RUNTIME_DIR/sbws
+  Runtime directory for the tor process launched by ``sbws``.
+
 SEE ALSO
 -
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Check disk space before running scanner

2018-09-05 Thread pastly 
commit 1054eea6150331b1215e6871c0b04020b4ba0331
Author: juga0 
Date:   Sun Jul 15 20:36:42 2018 +

Check disk space before running scanner
---
 sbws/core/generate.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sbws/core/generate.py b/sbws/core/generate.py
index f10ecc1..3c19ed4 100644
--- a/sbws/core/generate.py
+++ b/sbws/core/generate.py
@@ -5,6 +5,7 @@ from argparse import ArgumentDefaultsHelpFormatter
 import os
 import logging
 from sbws.util.timestamp import now_fname
+from ..util.fs import is_low_space
 
 log = logging.getLogger(__name__)
 
@@ -40,6 +41,8 @@ def gen_parser(sub):
 
 def main(args, conf):
 os.makedirs(conf.getpath('paths', 'v3bw_dname'), exist_ok=True)
+if is_low_space(conf):
+exit(1)
 
 datadir = conf.getpath('paths', 'datadir')
 if not os.path.isdir(datadir):



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Fix mistaken .[doc] by .[test]

2018-09-05 Thread pastly 
commit 012781f8811c46a224cb1a569aabd250f9609fa8
Author: juga0 
Date:   Wed Aug 29 07:59:38 2018 +

Fix mistaken .[doc] by .[test]
---
 INSTALL.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 7ab7558..73d960f 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -60,7 +60,7 @@ To run the tests, extra Python depenencies are needed:
 
 To install them from ``sbws`` ::
 
-pip install .[dev] && pip install .[doc]
+pip install .[dev] && pip install .[test]
 
 To run the tests::
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Warn when exception might be caused by no disk space

2018-09-05 Thread pastly 
commit 66189d6ffed40bac6b7e2e6d111ec68925d71af0
Author: juga0 
Date:   Thu Jul 12 21:32:32 2018 +

Warn when exception might be caused by no disk space
---
 sbws/lib/circuitbuilder.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sbws/lib/circuitbuilder.py b/sbws/lib/circuitbuilder.py
index e3b3950..66687b0 100644
--- a/sbws/lib/circuitbuilder.py
+++ b/sbws/lib/circuitbuilder.py
@@ -65,7 +65,9 @@ class CircuitBuilder:
 pass
 self.built_circuits.discard(circ_id)
 except (ControllerError, ValueError) as e:
-log.exception("Error trying to get circuit to close it: %s.", e)
+log.warning("Error trying to get circuit to close it: %s.", e,
+"If sbws didn't receive SIGHUP, "
+"maybe this system run out of disk space.")
 
 def _build_circuit_impl(self, path):
 if not valid_circuit_length(path):



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Remove anticipated config location in system package

2018-09-05 Thread pastly 
commit 4beeb253f11f1e6d30832440389b13a48190e022
Author: juga0 
Date:   Wed Aug 29 06:45:27 2018 +

Remove anticipated config location in system package

it will have to be added again when there is a system package
---
 DEPLOY.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index 8ed429c..fa58b62 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -34,8 +34,6 @@ To configure destinations, create a file called 
``config.ini``. It can be
 located in:
 
 * ``~/.sbws.ini`` if you are running ``sbws`` manually
-* ``/etc/sbws`` if you are running ``sbws`` from a system package as a
-  ``systemd`` directory (not yet supported)
 * any localion, an specify the path via the ``-c`` argument
 
 And edit destinations according to :doc:`man_sbws.ini`



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Correct path

2018-09-05 Thread pastly 
commit 66e2bca8d70d84bdec68f3271a000995b9a99294
Author: juga0 
Date:   Wed Aug 29 08:02:05 2018 +

Correct path
---
 INSTALL.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 85c70b9..eb9773f 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -96,7 +96,7 @@ To build the documentation diagrams::
 
 cd docs/ && make umlsvg
 
-The generated diagrams will be in ``docs/build/images/``.
+The generated diagrams will be in ``docs/build/_images/``.
 
 .. _virtualenv: https://virtualenv.pypa.io/en/stable/installation/
 .. _Stem: https://stem.torproject.org/



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Specify which python 3 version is supported

2018-09-05 Thread pastly 
commit 9239f69e84403f987e21bace17d26a8d087c7de0
Author: juga0 
Date:   Wed Aug 29 08:15:13 2018 +

Specify which python 3 version is supported
---
 INSTALL.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index eb9773f..3821aaf 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -12,7 +12,7 @@ System requirements
 
 
 - Tor
-- Python 3
+- Python 3 (>= 3.5)
 - virtualenv_ (while there is not ``stem`` release > 1.6.0, it is
   recommended to install the required python dependencies in a virtualenv)
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add example with default configuration path

2018-09-05 Thread pastly 
commit 7acff724bd16f4c63cab67f049cb395c208f8765
Author: juga0 
Date:   Wed Aug 29 07:28:48 2018 +

Add example with default configuration path
---
 docs/source/man_sbws.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/source/man_sbws.rst b/docs/source/man_sbws.rst
index 94bb9f2..775c7db 100644
--- a/docs/source/man_sbws.rst
+++ b/docs/source/man_sbws.rst
@@ -40,6 +40,9 @@ Optional arguments
 EXAMPLES
 
 
+sbws scanner
+Run the scanner using the configuration file in ~/.sbws.ini
+
 sbws -c ~/.sbwsrc scanner
 Run the scanner using the configuration file in ~/.sbwsrc
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] It is only the scanner that needs destinations

2018-09-05 Thread pastly 
commit bdf9384b92f3d269f8b77d16c7f84d8b21f9c1c6
Author: juga0 
Date:   Wed Aug 29 07:26:27 2018 +

It is only the scanner that needs destinations
---
 DEPLOY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index aafa093..e7f2a36 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -27,7 +27,7 @@ well connected machines.
 
 Install sbws according to :doc:`/INSTALL`.
 
-``sbws`` needs :term:`destination` (s) to request files from.
+``sbws scanner`` needs :term:`destination` (s) to request files from.
 They are not included by default.
 
 To configure destinations, create a file called ``config.ini``. It can be



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] config.ini is not a default configuration file

2018-09-05 Thread pastly 
commit 68cf30399b75822aac3100a57becfbf89343452d
Author: juga0 
Date:   Wed Aug 29 07:27:49 2018 +

config.ini is not a default configuration file
---
 DEPLOY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index 9bd53ba..7a20fae 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -34,7 +34,7 @@ To configure destinations, create a configuration file 
according to
 :doc:`man_sbws.ini`
 
 It is not required, but it is recomended to include a custom scanner
-``nickname`` in ``config.ini``.
+``nickname`` in the configuration file`.
 
 Destination(s) configuration in more detail::
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add valid destinations examples

2018-09-05 Thread pastly 
commit 36cf669bb5298fae499945514a676bdb8f2aa7e7
Author: juga0 
Date:   Wed Aug 29 07:55:16 2018 +

Add valid destinations examples
---
 docs/source/man_sbws.ini.rst | 22 ++
 1 file changed, 22 insertions(+)

diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst
index c96ec90..b63106b 100644
--- a/docs/source/man_sbws.ini.rst
+++ b/docs/source/man_sbws.ini.rst
@@ -155,6 +155,28 @@ logging
 Format string to use when logging to syslog.
 (Default: %(module)s[%(process)s]: <%(levelname)s> %(message)s)
 
+EXAMPLES
+
+
+Example ``destinations`` section::
+
+[destinations]
+foo = on
+bar = on
+baz = off
+
+[destinations.foo]
+# using HTTP
+url = http://example.org/sbws.bin
+
+[destinations.bar]
+# using HTTPS
+url = https://example.com/data
+
+[destinations.baz]
+# this will be ignored
+url = https://example.net/ask/stan/where/the/file/is.exe
+
 FILES
 -
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Remove what is now explained in man sbws.ini

2018-09-05 Thread pastly 
commit 99f516b02a6298b6e7b19ec5c741c2b0706d5931
Author: juga0 
Date:   Wed Aug 29 07:56:16 2018 +

Remove what is now explained in man sbws.ini
---
 DEPLOY.rst | 28 
 1 file changed, 28 deletions(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index 7a20fae..1e56924 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -32,31 +32,3 @@ They are not included by default.
 
 To configure destinations, create a configuration file according to
 :doc:`man_sbws.ini`
-
-It is not required, but it is recomended to include a custom scanner
-``nickname`` in the configuration file`.
-
-Destination(s) configuration in more detail::
-
-[destinations]
-foo = on
-bar = on
-baz = off
-
-[destinations.foo]
-url = http://example.org/sbws.bin
-
-[destinations.bar]
-url = https://example.com/data
-
-[destinations.baz]
-url = https://example.net/ask/stan/where/the/file/is.exe
-
-``foo`` demonstrates a typical case.
-
-``bar`` demonstrates a case where you want to use HTTPS and want to assume the
-large file for sbws to download is at its default path (probably
-``/sbws.bin``).
-
-``baz`` demonstrates a disabled destination that sbws will ignore.
-



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Clarify the url format

2018-09-05 Thread pastly 
commit 7b14f473bbdc68be23d0b4753c5d86a9af3e1722
Author: juga0 
Date:   Wed Aug 29 07:54:56 2018 +

Clarify the url format
---
 docs/source/man_sbws.ini.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst
index 1df9639..c96ec90 100644
--- a/docs/source/man_sbws.ini.rst
+++ b/docs/source/man_sbws.ini.rst
@@ -61,7 +61,8 @@ destinations
 
 destinations.STR
   url = STR
-The url to the destination
+The URL to the destination. It must include a file path.
+It can use both http or https.
 
 tor
   datadir = STR



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] No need to repeat what is already in man sbws.ini

2018-09-05 Thread pastly 
commit 2391db08a743e5180a52f9c074c90674c92ff3ad
Author: juga0 
Date:   Wed Aug 29 07:27:09 2018 +

No need to repeat what is already in man sbws.ini
---
 DEPLOY.rst | 10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index e7f2a36..9bd53ba 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -30,14 +30,8 @@ Install sbws according to :doc:`/INSTALL`.
 ``sbws scanner`` needs :term:`destination` (s) to request files from.
 They are not included by default.
 
-To configure destinations, create a file called ``config.ini``. It can be
-located in:
-
-* ``~/.sbws.ini`` if you are running ``sbws`` manually
-* any location, specify the path via the ``-c`` argument.
-  For instance: ``sbws -c myconfig.ini scanner``
-
-And edit destinations according to :doc:`man_sbws.ini`
+To configure destinations, create a configuration file according to
+:doc:`man_sbws.ini`
 
 It is not required, but it is recomended to include a custom scanner
 ``nickname`` in ``config.ini``.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] English wording

2018-09-05 Thread pastly 
commit a1390f7ba8f23f4b483b8a27ec47bf5404228d23
Author: juga0 
Date:   Wed Aug 29 06:56:20 2018 +

English wording
---
 INSTALL.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 23217c1..7ab7558 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -6,7 +6,7 @@ Installing Simple Bandwidth Scanner
 The prefered method to install ``sbws`` is to install it from your system
 distribution.
 Currently there is not any system distribution package.
-In the meanwhile, follow the following steps.
+In the meantime, follow the following steps.
 
 System requirements
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Fix type and add command example

2018-09-05 Thread pastly 
commit 0ccab0cc2239c70302928fcec1724dd95b75b501
Author: juga0 
Date:   Wed Aug 29 06:47:49 2018 +

Fix type and add command example
---
 DEPLOY.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index fa58b62..610dd77 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -34,7 +34,8 @@ To configure destinations, create a file called 
``config.ini``. It can be
 located in:
 
 * ``~/.sbws.ini`` if you are running ``sbws`` manually
-* any localion, an specify the path via the ``-c`` argument
+* any location, specify the path via the ``-c`` argument.
+  For instance: ``sbws -c myconfig.ini scanner``
 
 And edit destinations according to :doc:`man_sbws.ini`
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Change location for path

2018-09-05 Thread pastly 
commit fae15990176a5262a6903092045bdacd678bc37e
Author: juga0 
Date:   Wed Aug 29 07:24:04 2018 +

Change location for path
---
 docs/source/man_sbws.ini.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst
index b003bef..3ed78e5 100644
--- a/docs/source/man_sbws.ini.rst
+++ b/docs/source/man_sbws.ini.rst
@@ -151,7 +151,7 @@ FILES
 -
 
 $HOME/.sbws.ini
-   Default location for the sbws user configuration file.
+   Default ``sbws`` user configuration path.
 
 $HOME/.sbws
Default sbws home, where it stores measurement data files,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Fix link typo

2018-09-05 Thread pastly 
commit 9ee4f86d5caedba59e2a258036297a935f350b38
Author: juga0 
Date:   Tue Aug 28 15:34:49 2018 +

Fix link typo
---
 INSTALL.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 8a5807b..23217c1 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -108,4 +108,4 @@ The generated diagrams will be in `docs/build/images/`.
 .. _Coverage: https://coverage.readthedocs.io/
 .. _Sphinx: http://www.sphinx-doc.org
 .. _recommonmark: https://recommonmark.readthedocs.io/
-.. _Pylint_: https://www.pylint.org/
\ No newline at end of file
+.. _Pylint: https://www.pylint.org/



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add path to URL

2018-09-05 Thread pastly 
commit 855432dae4331728cf19c6374df84f9f1318ef62
Author: juga0 
Date:   Wed Aug 29 06:55:13 2018 +

Add path to URL
---
 DEPLOY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index 610dd77..aafa093 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -53,7 +53,7 @@ Destination(s) configuration in more detail::
 url = http://example.org/sbws.bin
 
 [destinations.bar]
-url = https://example.com
+url = https://example.com/data
 
 [destinations.baz]
 url = https://example.net/ask/stan/where/the/file/is.exe



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Make 'no destinations' error message point to man page

2018-09-05 Thread pastly 
commit 726fe24a42676166e4df0bd7a333404be7c40c05
Author: Matt Traudt 
Date:   Tue Aug 28 14:33:04 2018 -0400

Make 'no destinations' error message point to man page
---
 sbws/lib/destination.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py
index ed1bc9b..86d76c7 100644
--- a/sbws/lib/destination.py
+++ b/sbws/lib/destination.py
@@ -234,7 +234,9 @@ class DestinationList:
 conf[dest_sec],
 conf.getint('scanner', 'max_download_size')))
 if len(dests) < 1:
-return None, 'No enabled destinations in config'
+msg = 'No enabled destinations in config. Please see '\
+'"man sbws.ini" for help adding and enabling destinations'
+return None, msg
 return DestinationList(conf, dests, circuit_builder, relay_list,
controller), ''
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add changelog entry

2018-09-05 Thread pastly 
commit 70648236070040ba4a49dc083aa46bd4b2da86db
Author: juga0 
Date:   Tue Aug 28 15:29:54 2018 +

Add changelog entry
---
 CHANGELOG.md | 12 
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1a6d1a..f45182e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,18 @@ and this project adheres to [Semantic 
Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Changed
+
+- sbws install doc is confusing (#27341)
+  - Include system and Python dependencies in `INSTALL`.
+  - Include dependencies for docs and tests in `INSTALL`.
+  - Point to `DEPLOY` to run sbws.
+  - Remove obsolete sections in `INSTALL`
+  - Simplify `DEPLOY`, reuse terms in the `glossary`.
+  - Remove obsolete ``sbws init`` from `DEPLOY`.
+  - Point to config documentation.
+  - Add, unify and reuse terms in `glossary`.
+
 ## [0.7.0] - 2018-08-09
 
 **Important changes**:



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Fix a missed conf['path'] -> conf.getpath() transition

2018-09-05 Thread pastly 
commit 43812bed068fd1933022ccae8e83d67f9e84cb1e
Author: Matt Traudt 
Date:   Tue Aug 28 14:18:59 2018 -0400

Fix a missed conf['path'] -> conf.getpath() transition
---
 sbws/core/scanner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index 3e24d22..4e59498 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -379,7 +379,7 @@ def main(args, conf):
 
 os.makedirs(conf.getpath('paths', 'datadir'), exist_ok=True)
 
-state = State(conf['paths']['state_fname'])
+state = State(conf.getpath('paths', 'state_fname'))
 state['scanner_started'] = now_isodt_str()
 
 try:



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Fix broken envvar in config.default.ini

2018-09-05 Thread pastly 
commit c0885dcb4e77c58eb0afe9635172a5a93557dd0e
Author: Matt Traudt 
Date:   Tue Aug 28 14:20:27 2018 -0400

Fix broken envvar in config.default.ini
---
 CHANGELOG.md| 5 +
 sbws/config.default.ini | 2 +-
 sbws/util/config.py | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1a6d1a..b760644 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic 
Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+
+- Broken environment variable in default sbws config. To use envvar $FOO, write
+  $$FOO in the config.
+
 ## [0.7.0] - 2018-08-09
 
 **Important changes**:
diff --git a/sbws/config.default.ini b/sbws/config.default.ini
index 0ad0ebf..e7950b1 100644
--- a/sbws/config.default.ini
+++ b/sbws/config.default.ini
@@ -59,7 +59,7 @@ max_download_size = 1073741824
 [tor]
 datadir = ${paths:sbws_home}/tor
 # create runtime dir for data that does not need to be persistent
-run_dpath = $XDG_RUNTIME_DIR/sbws
+run_dpath = $$XDG_RUNTIME_DIR/sbws
 control_socket = ${tor:run_dpath}/control
 pid = ${tor:run_dpath}/tor.pid
 # note this is a directory
diff --git a/sbws/util/config.py b/sbws/util/config.py
index 9532bdc..3577c5a 100644
--- a/sbws/util/config.py
+++ b/sbws/util/config.py
@@ -26,7 +26,8 @@ log = logging.getLogger(__name__)
 
 def _expand_path(path):
 """Expand path string containing shell variables and ~ constructions
-into their values.
+into their values. Environment variables have to have their $ escaped by
+another $. For example: $$XDG_RUNTIME_DIR/foo.bar
 """
 return os.path.expanduser(os.path.expandvars(path))
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Default user config location is ~/.sbws.ini

2018-09-05 Thread pastly 
commit 75441b03281aed317b54f1312f4aef542a9291d6
Author: juga0 
Date:   Wed Aug 29 06:43:55 2018 +

Default user config location is ~/.sbws.ini
---
 DEPLOY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index 41ff9cd..8ed429c 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -33,7 +33,7 @@ They are not included by default.
 To configure destinations, create a file called ``config.ini``. It can be
 located in:
 
-* ``~/.sbws/`` if you are running ``sbws`` manually
+* ``~/.sbws.ini`` if you are running ``sbws`` manually
 * ``/etc/sbws`` if you are running ``sbws`` from a system package as a
   ``systemd`` directory (not yet supported)
 * any localion, an specify the path via the ``-c`` argument



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Use domains reserved for examples

2018-09-05 Thread pastly 
commit 5e7ff7303eccb0996e221bded92ba7b0fe06682a
Author: juga0 
Date:   Tue Aug 28 14:57:37 2018 +

Use domains reserved for examples
---
 DEPLOY.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index f94e0f7..5ed375b 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -50,13 +50,13 @@ Destination(s) configuration in more detail::
 baz = off
 
 [destinations.foo]
-url = http://fooshoomoo.com/sbws.bin
+url = http://example.org/sbws.bin
 
 [destinations.bar]
-url = https://barstoolsinc.com
+url = https://example.com
 
 [destinations.baz]
-url = https://bazistan.com/ask/stan/where/the/file/is.exe
+url = https://example.net/ask/stan/where/the/file/is.exe
 
 ``foo`` demonstrates a typical case.
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Remove versions and just clone sbws

2018-09-05 Thread pastly 
commit 6a1668c62182761fa00980906e6ef6ea74726dc6
Author: juga0 
Date:   Tue Aug 28 15:06:40 2018 +

Remove versions and just clone sbws
---
 INSTALL.rst | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 7c74c0f..dd0dc2f 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -33,13 +33,9 @@ To install the Python dependencies, create a ``virtualenv`` 
first
 virtualenv venv -p /usr/bin/python3
 source venv/bin/activate
 
-Install stem in virtualenv
-
+Clone ``sbws``::
 
-Sbws requires on features not yet in a released version of stem (1.7.0 has not
-been released as of the time of writing). You can either install from the
-master branch, or checkout ``60f034ad8b9c3aa48e7e2ecb0a2e159b6ed5bc71`` or
-newer.
+git clone https://gitweb.torproject.org/sbws.git
 
 ::
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add extra dependencies for tests. Remove obsolete

2018-09-05 Thread pastly 
commit b199c3afa122f77201299c05b23be501cc0cd16b
Author: juga0 
Date:   Tue Aug 28 15:09:08 2018 +

Add extra dependencies for tests. Remove obsolete
---
 INSTALL.rst | 34 +-
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 2fccc46..4041223 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -48,35 +48,19 @@ Install the python dependencies::
 ``sbws`` needs :term:`destination` s to request files from.
 Please, see :ref:`deploy` to know how to configure, deploy and run ``sbws``.
 
-If you would like to use a custom configuration file you can create it in
-``~/.sbws.ini`` or provide ``sbws`` with it via ``-c`` ``--config`` option.
+Installing tests dependencies and running them
+
 
-See the documentation section about configuration files for more information
-about how to create a configuration file.
+To run the tests, extra Python depenencies are needed:
 
-Tor run the scanner run
-::
-
-sbws scanner
-
-
-[OBSOLETE DO NOT FOLLOW] Virtualenv - Production
---
-
-Installing
-~~
-
-::
+- Flake8_
+- tox_
+- pytest_
+- coverage_
 
-git clone https://github.com/pastly/simple-bw-scanner.git
-cd simple-bw-scanner
-git checkout v1.5.3
-virtualenv -p python3 venv
-source venv/bin/activate
-pip install --process-dependency-links .
-sbws init
+To install them from ``sbws`` ::
 
-.. note::
+pip install .[dev] && pip install .[doc]
 
 Because we relay on a ``-dev`` version of stem, we need to fetch it from
 git.torproject.org. Thus ``--process-dependency-links`` is necessary.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Update links to the dependencies

2018-09-05 Thread pastly 
commit bd17b20dde344bb64e5956afb8665979ecdd9efe
Author: juga0 
Date:   Tue Aug 28 15:13:19 2018 +

Update links to the dependencies
---
 INSTALL.rst | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index b774ae2..8a5807b 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -98,4 +98,14 @@ To build the documentation diagrams::
 
 The generated diagrams will be in `docs/build/images/`.
 
-This doesn't update dependencies and needs to be fixed.
+.. _virtualenv: https://virtualenv.pypa.io/en/stable/installation/
+.. _Stem: https://stem.torproject.org/
+.. _socks: http://docs.python-requests.org/en/master/user/advanced/#socks
+.. _Requests: http://docs.python-requests.org/
+.. _Flake8: http://flake8.pycqa.org/
+.. _pytest: https://docs.pytest.org/
+.. _tox: https://tox.readthedocs.io
+.. _Coverage: https://coverage.readthedocs.io/
+.. _Sphinx: http://www.sphinx-doc.org
+.. _recommonmark: https://recommonmark.readthedocs.io/
+.. _Pylint_: https://www.pylint.org/
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] And remove it from README

2018-09-05 Thread pastly 
commit 59b42b085931c44fb474753e04cead8bc8945de8
Author: juga0 
Date:   Tue Aug 28 15:10:23 2018 +

And remove it from README
---
 README.md | 9 -
 1 file changed, 9 deletions(-)

diff --git a/README.md b/README.md
index 7072f8b..ddf4d20 100644
--- a/README.md
+++ b/README.md
@@ -133,12 +133,3 @@ In this directory you will find
 - `v3bw/` This directory stores the v3bw files created with `sbws generate`.
 - `state.dat` A file for storing state needed between sbws commands. See its
   documentation for more information.
-
-## Running tests
-
-Make sure you have test dependencies installed. From within the top level
-repository directory:
-
-pip install -e .[test]
-
-This should install tox and pytest. Then simply run `tox`.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Explain how to build docs. Remove obsolete

2018-09-05 Thread pastly 
commit b16d5c0113c7bfe299336ddc2515e5f1c5ff8247
Author: juga0 
Date:   Tue Aug 28 15:11:56 2018 +

Explain how to build docs. Remove obsolete
---
 INSTALL.rst | 31 +--
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index f83489d..b774ae2 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -80,35 +80,22 @@ To install them from ``sbws``::
 
 pip install .[doc]
 
-::
-
-git clone https://github.com/pastly/simple-bw-scanner.git
-cd simple-bw-scanner
-git checkout v1.5.3
-virtualenv -p python3 venv-editable
-source venv-editable/bin/activate
-pip install --process-dependency-links --editable .
-sbws init
+To build the documentation as HTML::
 
-.. note::
+cd docs/ && make html
 
-Because we relay on a ``-dev`` version of stem, we need to fetch it from
-git.torproject.org. Thus ``--process-dependency-links`` is necessary.
+The generated HTML will be in `docs/build/`.
 
-.. warning::
+To build the manual (``man``) pages::
 
-Run these commands one at a time and check for errors before continuing.
+cd docs/ && make man
 
-Updating
-
+The generated man pages will be in `docs/man/`.
 
-::
+To build the documentation diagrams::
 
-cd simple-bw-scanner
-git pull
-# Determine the newest released version. Assuming it is v1.5.3 ...
-git checkout v1.5.3
+cd docs/ && make umlsvg
 
-.. todo::
+The generated diagrams will be in `docs/build/images/`.
 
 This doesn't update dependencies and needs to be fixed.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Create virtualenv using python 3

2018-09-05 Thread pastly 
commit 16423a51dfd114d39e24284093484ccf22539c25
Author: juga0 
Date:   Tue Aug 28 15:06:01 2018 +

Create virtualenv using python 3
---
 INSTALL.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 2c7d2f3..7c74c0f 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -26,12 +26,11 @@ Python dependencies
 - Stem_ > 1.6.0
 - Requests_ (with socks_ support) >= 2.10.0
 
-I like to keep mine in my simple-bw-scanner directory and assume that's where
-you'll put it.
+To install the Python dependencies, create a ``virtualenv`` first
 
 ::
 
-virtualenv -p python3 venv
+virtualenv venv -p /usr/bin/python3
 source venv/bin/activate
 
 Install stem in virtualenv



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Remove obsolote command, add requirement

2018-09-05 Thread pastly 
commit ac56d0087d11862c0a289b1c1a7fe298765d1822
Author: juga0 
Date:   Tue Aug 28 14:53:42 2018 +

Remove obsolote command, add requirement
---
 DEPLOY.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index dfb8e1c..4411d85 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -26,8 +26,8 @@ well connected machines.
 
 Install sbws according to :doc:`/INSTALL`.
 
-Make sure you have initialized sbws. If you haven't already run ``sbws init``,
-then enter your virtualenv and run it.
+``sbws`` needs :term:`destination` (s) to request files from.
+They are not included by default.
 
 Inside |dotsbws| you will find ``config.ini``. Open it with a text editor. it
 should be very simple. Let's give our scanner a nickname. Add the following



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Remove unneed steps, include system dependencies example

2018-09-05 Thread pastly 
commit d42c53080b7ab35bc60d823e5fbc8565f62c66c5
Author: juga0 
Date:   Tue Aug 28 15:04:20 2018 +

Remove unneed steps, include system dependencies example
---
 INSTALL.rst | 30 ++
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 1c6775e..4122e4a 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -16,35 +16,9 @@ System requirements
 - virtualenv_ (while there is not ``stem`` release > 1.6.0, it is
   recommended to install the required python dependencies in a virtualenv)
 
+In Debian::
 
-.. _Stem: https://stem.torproject.org/
-.. _Requests: http://docs.python-requests.org/
-
-.. _release page: https://github.com/pastly/simple-bw-scanner/releases
-
-Virtualenv - Development
---
-
-Choose a directory to store code in. I might choose ``~/src``.
-
-::
-
-cd ~/src
-
-Get stem
-~
-
-::
-
-git clone https://git.torproject.org/stem.git
-
-Get sbws
-~
-
-::
-
-git clone https://github.com/pastly/simple-bw-scanner.git
-cd simple-bw-scanner
+sudo apt install tor python3 virtualenv
 
 
 Create and enter virtualenv



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add extra dependencies for docs. Remove obsolete

2018-09-05 Thread pastly 
commit f92a10276157c1fa9437322e48eabe47b25fbfff
Author: juga0 
Date:   Tue Aug 28 15:11:10 2018 +

Add extra dependencies for docs. Remove obsolete
---
 INSTALL.rst | 24 
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 9eac885..f83489d 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -66,27 +66,19 @@ To run the tests::
 
 tox
 
-Run these commands one at a time and check for errors before continuing.
 
-Updating
-
-
-::
+Installing documentation dependendencies and building it
+-
 
-cd simple-bw-scanner
-git pull
-# Determine the newest released version. Assuming it is v1.5.3 ...
-git checkout v1.5.3
-source venv/bin/activate
-pip install --process-dependency-links --upgrade-strategy eager --upgrade .
+To build the documentation, extra Python dependencies are needed:
 
+- Sphinx_
+- recommonmark_
+- Pylint_ (only to update the diagrams)
 
-[OBSOLETE DO NOT FOLLOW] Virtualenv - Development
---
+To install them from ``sbws``::
 
-These are almost exactly the same. The difference is the pip command: we
-install sbws in an editable state so we don't have to re-run pip every time we
-make a change.
+pip install .[doc]
 
 ::
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Remove versions and install python dependencies with pip

2018-09-05 Thread pastly 
commit d3f5dd202c57ae68e2e8aea59b535dc5b3967674
Author: juga0 
Date:   Tue Aug 28 15:07:35 2018 +

Remove versions and install python dependencies with pip
---
 INSTALL.rst | 19 +--
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index dd0dc2f..21e8fbd 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -37,22 +37,13 @@ Clone ``sbws``::
 
 git clone https://gitweb.torproject.org/sbws.git
 
-::
-
-pip install ../stem
-
-Install sbws and its remaining dependencies
-~
+Install the python dependencies::
 
-Here is where you might want to know what the latest release of sbws is (this
-document assumes it is 1.5.3). Skip
-the ``git checkout`` if you want to run the bleeding edge tip-of-master version
-of sbws.
+cd sbws && pip install --process-dependency-links .
 
-::
-
-git checkout v1.5.3
-pip install .
+.. note:: ``process-dependency-links`` will clone ``stem`` from master and
+   install it. It's deprecated, but it won't be needed as soon as there is
+   an ``stem`` release > 1.6.0
 
 Run sbws
 ~~



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Remove paragraph about versions

2018-09-05 Thread pastly 
commit a0f750566b85458ab92bb3250efca12afd246899
Author: juga0 
Date:   Tue Aug 28 15:02:27 2018 +

Remove paragraph about versions
---
 INSTALL.rst | 5 -
 1 file changed, 5 deletions(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index b61c642..1c6775e 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -16,11 +16,6 @@ System requirements
 - virtualenv_ (while there is not ``stem`` release > 1.6.0, it is
   recommended to install the required python dependencies in a virtualenv)
 
-Read all the information for the installation method of your choice before
-beginning. Often you will want to be armed with the knowledge of the latest
-released version of sbws. Determine that by examining its git tags, or visiting
-its `release page`_. In the remainder of this document, we assume the latest
-version is 1.5.3, which would be tagged as ``v1.5.3``.
 
 .. _Stem: https://stem.torproject.org/
 .. _Requests: http://docs.python-requests.org/



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add all the system requirements

2018-09-05 Thread pastly 
commit 3c4dfeb8069270b525c30bca26535db1e8c6b852
Author: juga0 
Date:   Tue Aug 28 15:00:01 2018 +

Add all the system requirements
---
 INSTALL.rst | 19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 1ccfa1b..b61c642 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -3,13 +3,18 @@
 Installing Simple Bandwidth Scanner
 ===
 
-(At the time of writing) sbws depends on two Python libraries.
-
-- Stem_
-- Requests_
-
-Sbws relies on a stem feature that is not planned to be in a tagged release
-until stem 1.7.0.
+The prefered method to install ``sbws`` is to install it from your system
+distribution.
+Currently there is not any system distribution package.
+In the meanwhile, follow the following steps.
+
+System requirements
+
+
+- Tor
+- Python 3
+- virtualenv_ (while there is not ``stem`` release > 1.6.0, it is
+  recommended to install the required python dependencies in a virtualenv)
 
 Read all the information for the installation method of your choice before
 beginning. Often you will want to be armed with the knowledge of the latest



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Explain how to run tests

2018-09-05 Thread pastly 
commit 52d4e7d4ae9564a305cce0904a3b0920a73bbff4
Author: juga0 
Date:   Tue Aug 28 15:09:43 2018 +

Explain how to run tests
---
 INSTALL.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 4041223..9eac885 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -62,10 +62,9 @@ To install them from ``sbws`` ::
 
 pip install .[dev] && pip install .[doc]
 
-Because we relay on a ``-dev`` version of stem, we need to fetch it from
-git.torproject.org. Thus ``--process-dependency-links`` is necessary.
+To run the tests::
 
-.. warning::
+tox
 
 Run these commands one at a time and check for errors before continuing.
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Explain where config should create and where to find doc about it

2018-09-05 Thread pastly 
commit 18039b8060dbf4665154b059b64350b3fd239095
Author: juga0 
Date:   Tue Aug 28 14:55:54 2018 +

Explain where config should create and where to find doc about it
---
 DEPLOY.rst | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index 4411d85..ea20302 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -29,14 +29,15 @@ Install sbws according to :doc:`/INSTALL`.
 ``sbws`` needs :term:`destination` (s) to request files from.
 They are not included by default.
 
-Inside |dotsbws| you will find ``config.ini``. Open it with a text editor. it
-should be very simple. Let's give our scanner a nickname. Add the following
-lines
+To configure destinations, create a file called ``config.ini``. It can be
+located in:
 
-::
+* ``~/.sbws/`` if you are running ``sbws`` manually
+* ``/etc/sbws`` if you are running ``sbws`` from a system package as a
+  ``systemd`` directory (not yet supported)
+* any localion, an specify the path via the ``-c`` argument
 
-[scanner]
-nickname = D0ntD3@dOpen!nside
+And edit destinations according to :doc:`man_sbws.ini`
 
 (Pick your own nickname. This one just demonstrates that you can use almost any
 character)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add python dependencies

2018-09-05 Thread pastly 
commit 2042e36527c3a64e00554a1fb882383247d067d4
Author: juga0 
Date:   Tue Aug 28 15:05:12 2018 +

Add python dependencies
---
 INSTALL.rst | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 4122e4a..2c7d2f3 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -20,9 +20,11 @@ In Debian::
 
 sudo apt install tor python3 virtualenv
 
+Python dependencies
+
 
-Create and enter virtualenv
-~
+- Stem_ > 1.6.0
+- Requests_ (with socks_ support) >= 2.10.0
 
 I like to keep mine in my simple-bw-scanner directory and assume that's where
 you'll put it.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Specify what is nickname is optional

2018-09-05 Thread pastly 
commit adee13d12da114a07e9ff185dc314467f27484ab
Author: juga0 
Date:   Tue Aug 28 14:56:47 2018 +

Specify what is nickname is optional
---
 DEPLOY.rst | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index ea20302..f94e0f7 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -39,16 +39,10 @@ located in:
 
 And edit destinations according to :doc:`man_sbws.ini`
 
-(Pick your own nickname. This one just demonstrates that you can use almost any
-character)
+It is not required, but it is recomended to include a custom scanner
+``nickname`` in ``config.ini``.
 
-Congratulations, you've learned how to add a section to your config file and
-how to add an option to a section.
-
-Remeber |dests|? We need to add them to ``config.ini``. We're going to assume
-you have two you are ready to use and one that isn't quite ready yet.
-
-::
+Destination(s) configuration in more detail::
 
 [destinations]
 foo = on



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] And remove it from README

2018-09-05 Thread pastly 
commit 2303b06399edb4a976872b491d0cde6d62c35dbe
Author: juga0 
Date:   Tue Aug 28 15:12:46 2018 +

And remove it from README
---
 README.md | 8 
 1 file changed, 8 deletions(-)

diff --git a/README.md b/README.md
index ddf4d20..6febd3a 100644
--- a/README.md
+++ b/README.md
@@ -111,14 +111,6 @@ how its code is laid out. Therefore the code may change 
drastically without a
 major version bump as long as the way users interact with it does not change in
 a backward incompatible way.
 
-### Build HTML documentation
-
-pip install -e .[doc]
-cd docs
-make html
-
-The generated HTML will be in `docs/build/`.
-
 ## The `.sbws` directory
 
 By default is `~/.sbws`.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add refernce to deploy

2018-09-05 Thread pastly 
commit 18d992abbfdf4a0110bd9c36950c52470d2f5f3c
Author: juga0 
Date:   Tue Aug 28 15:08:01 2018 +

Add refernce to deploy
---
 INSTALL.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/INSTALL.rst b/INSTALL.rst
index 21e8fbd..2fccc46 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -45,8 +45,8 @@ Install the python dependencies::
install it. It's deprecated, but it won't be needed as soon as there is
an ``stem`` release > 1.6.0
 
-Run sbws
-~~
+``sbws`` needs :term:`destination` s to request files from.
+Please, see :ref:`deploy` to know how to configure, deploy and run ``sbws``.
 
 If you would like to use a custom configuration file you can create it in
 ``~/.sbws.ini`` or provide ``sbws`` with it via ``-c`` ``--config`` option.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Reuse glossary term

2018-09-05 Thread pastly 
commit 3432effef20007a9d9c6b9616581404a6748df67
Author: juga0 
Date:   Tue Aug 28 14:52:47 2018 +

Reuse glossary term
---
 DEPLOY.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index e6eb185..dfb8e1c 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -21,9 +21,8 @@ well connected machines.
 - Optional support for TLS
 - A large file; at the time of writing, at least 1 GiB in size
 
-|scanner_nick| setup

-
+:term:`scanner` setup
+--
 
 Install sbws according to :doc:`/INSTALL`.
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Reuse glossary term

2018-09-05 Thread pastly 
commit 1d23f7d0baa30ad328fec29ca4fcc01c92a894a6
Author: juga0 
Date:   Tue Aug 28 14:51:12 2018 +

Reuse glossary term
---
 DEPLOY.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index f5ae2cb..2d2e65e 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -5,9 +5,8 @@ Deploying Simple Bandwidth Scanner
 
 So you want to run sbws for yourself. You will need
 
-- A machine to measure from, hereafter referred to as |scanner_nick|.
-- One or more webservers hosting a large file, hereafter referred to as
-  |dests|.
+- A machine to run the :term:`scanner`.
+- One or more :term:`destination` (s) that serve a large file.
 
 Both |scanner_nick| and your |dests| should be on fast, well connected
 machines.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Simplify definition with specification terms

2018-09-05 Thread pastly 
commit b53827073864c5bd32a4584236868af859baeffd
Author: juga0 
Date:   Tue Aug 28 14:45:51 2018 +

Simplify definition with specification terms
---
 docs/source/glossary.rst | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/source/glossary.rst b/docs/source/glossary.rst
index ab4bf29..30e070b 100644
--- a/docs/source/glossary.rst
+++ b/docs/source/glossary.rst
@@ -30,10 +30,7 @@ Glossary
 to know about the file specification.
 
sbws scanner
-The sbws command that a :term:`bandwidth authority` runs continuously
-to gather information about how fast Tor relays are. The results from
-this process are used by :term:`sbws generate` to generate
-:term:`v3bw files `.
+The ``sbws`` command used to run ``sbws`` as a :term:`scanner`.
 
sbws generate
 The sbws command that a :term:`bandwidth authority` runs periodically



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add term to be used in DEPLOY.rst

2018-09-05 Thread pastly 
commit 9be8d7de0034839045db77a1512d08eb5a5e26de
Author: juga0 
Date:   Tue Aug 28 14:48:04 2018 +

Add term to be used in DEPLOY.rst
---
 docs/source/glossary.rst | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/source/glossary.rst b/docs/source/glossary.rst
index 575088e..7d175b6 100644
--- a/docs/source/glossary.rst
+++ b/docs/source/glossary.rst
@@ -42,4 +42,8 @@ Glossary
 .. literalinclude:: v3bw.txt
 :caption: A v3bw file
 
-.. glossary::
+   destination
+The term used by ``sbws`` to refer to a Web server where the
+:term:`scanner` request files to perform the bandwith measurements.
+
+.. [#] https://metrics.torproject.org/glossary.html



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Reuse glossary term

2018-09-05 Thread pastly 
commit a8bf0785bc01900ccacad0f4a8bd6f77dd1e7029
Author: juga0 
Date:   Tue Aug 28 14:51:33 2018 +

Reuse glossary term
---
 DEPLOY.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index 2d2e65e..b9f63b7 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -8,8 +8,8 @@ So you want to run sbws for yourself. You will need
 - A machine to run the :term:`scanner`.
 - One or more :term:`destination` (s) that serve a large file.
 
-Both |scanner_nick| and your |dests| should be on fast, well connected
-machines.
+Both :term:`scanner` and your :term:`destination` (s) should be on fast,
+well connected machines.
 
 |scanner_nick| requirements
 ---



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Reuse glossary term and do not repeat requirements

2018-09-05 Thread pastly 
commit 560052868dd9adee2b1093530218e3e40b46b2d2
Author: juga0 
Date:   Tue Aug 28 14:52:29 2018 +

Reuse glossary term and do not repeat requirements
---
 DEPLOY.rst | 19 +--
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index b9f63b7..e6eb185 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -11,22 +11,13 @@ So you want to run sbws for yourself. You will need
 Both :term:`scanner` and your :term:`destination` (s) should be on fast,
 well connected machines.
 
-|scanner_nick| requirements

-
-- A fast, well connected machine on the Internet. Ideally its bandwidth should
-  not be a limiting factor in measurements.
-- Linux host OS
-- Python 3, virtualenv
-- Tor installed with ``tor`` in your ``PATH``
+.. _destinations_requirements:
 
-|dests| requirements

+:term:`destination` requirements
+
 
-- A fast, well connected machine on the Internet. Ideally its bandwidth should
-  not be a limiting factor in measurements.
-- Some sort of webserver installed and running that supports HEAD and GET
-  requests (apache and nginx fit this description)
+- A Web server installed and running that supports HEAD and GET
+  requests (``apache`` and ``nginx`` fit this description)
 - Optional support for TLS
 - A large file; at the time of writing, at least 1 GiB in size
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add reference label to deploy file

2018-09-05 Thread pastly 
commit 2d1a6355a75f43e4e2c77bd100eee1940657f69f
Author: juga0 
Date:   Tue Aug 28 14:50:21 2018 +

Add reference label to deploy file
---
 DEPLOY.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/DEPLOY.rst b/DEPLOY.rst
index e3c4ac4..f5ae2cb 100644
--- a/DEPLOY.rst
+++ b/DEPLOY.rst
@@ -1,3 +1,5 @@
+.. _deploy:
+
 Deploying Simple Bandwidth Scanner
 =
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Indent example to the correct term

2018-09-05 Thread pastly 
commit fb76c84fd593e66f9f4b76b5a670e71947ae519e
Author: juga0 
Date:   Tue Aug 28 14:47:21 2018 +

Indent example to the correct term
---
 docs/source/glossary.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/glossary.rst b/docs/source/glossary.rst
index 2b5d56d..575088e 100644
--- a/docs/source/glossary.rst
+++ b/docs/source/glossary.rst
@@ -39,7 +39,7 @@ Glossary
 The term used by ``sbws`` to refer to :term:`bandwidth list file`
 v1.1.0.
 
-.. literalinclude:: v3bw.txt
-:caption: A v3bw file
+.. literalinclude:: v3bw.txt
+:caption: A v3bw file
 
 .. glossary::



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Simplify definition with specification terms

2018-09-05 Thread pastly 
commit 093283236c73cbf32c308a33c01ef7572998883c
Author: juga0 
Date:   Tue Aug 28 14:46:53 2018 +

Simplify definition with specification terms
---
 docs/source/glossary.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/glossary.rst b/docs/source/glossary.rst
index 394f5f5..2b5d56d 100644
--- a/docs/source/glossary.rst
+++ b/docs/source/glossary.rst
@@ -36,8 +36,8 @@ Glossary
 The ``sbws`` command used to run ``sbws`` as a :term:`generator`.
 
v3bw file
-The file generated by :term:`sbws generate` that a :term:`bandwidth
-authority` reads to vote about how fast relays are.
+The term used by ``sbws`` to refer to :term:`bandwidth list file`
+v1.1.0.
 
 .. literalinclude:: v3bw.txt
 :caption: A v3bw file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Reuse terms used in the specification

2018-09-05 Thread pastly 
commit db731a22b1c30a6a0678e5ba4a4fb6a138eee078
Author: juga0 
Date:   Tue Aug 28 14:42:49 2018 +

Reuse terms used in the specification
---
 docs/source/glossary.rst | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/source/glossary.rst b/docs/source/glossary.rst
index 4c0a45b..6f0b98b 100644
--- a/docs/source/glossary.rst
+++ b/docs/source/glossary.rst
@@ -9,10 +9,9 @@ Glossary
 directory authorities. [#]_
 
bandwidth authority
-A :term:`directory authority` that measures and votes about Tor relay
-bandwidths. In the context of sbws, it performs measurements with
-:term:`sbws scanner` and creates :term:`v3bw files `
-periodically with :term:`sbws generate`
+A :term:`directory authority` that runs a :term:`scanner` and a
+:term:`generator` or obtain :term:`bandwidth list file` s from a
+:term:`generator`.
 
sbws scanner
 The sbws command that a :term:`bandwidth authority` runs continuously



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Simplify definition with specification terms

2018-09-05 Thread pastly 
commit d18ca62f1d786fc25f918a6ce2eb4a2d7db1e1dc
Author: juga0 
Date:   Tue Aug 28 14:46:15 2018 +

Simplify definition with specification terms
---
 docs/source/glossary.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/source/glossary.rst b/docs/source/glossary.rst
index 30e070b..394f5f5 100644
--- a/docs/source/glossary.rst
+++ b/docs/source/glossary.rst
@@ -33,9 +33,7 @@ Glossary
 The ``sbws`` command used to run ``sbws`` as a :term:`scanner`.
 
sbws generate
-The sbws command that a :term:`bandwidth authority` runs periodically
-to generate a new :term:`v3bw file` from results gathered by
-:term:`sbws scanner`.
+The ``sbws`` command used to run ``sbws`` as a :term:`generator`.
 
v3bw file
 The file generated by :term:`sbws generate` that a :term:`bandwidth



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Use same definition as in metrics.tpo

2018-09-05 Thread pastly 
commit 6c2a20d29c14cef5b082f0e75c166a281f7d59d2
Author: juga0 
Date:   Tue Aug 28 14:31:06 2018 +

Use same definition as in metrics.tpo

Let's try to reuse terms and reuse definitions, terms are already
confusing enough.
---
 docs/source/glossary.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/source/glossary.rst b/docs/source/glossary.rst
index 251b72f..4c0a45b 100644
--- a/docs/source/glossary.rst
+++ b/docs/source/glossary.rst
@@ -4,9 +4,9 @@ Glossary
 .. glossary::
 
directory authority
-One of the trusted entities in the Tor network. Calculates a consensus
-with the other directory authorities about what relays are running and
-much much more.
+a special-purpose relay that maintains a list of currently-running
+relays and periodically publishes a consensus together with the other
+directory authorities. [#]_
 
bandwidth authority
 A :term:`directory authority` that measures and votes about Tor relay



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add term used in the specification

2018-09-05 Thread pastly 
commit 85e7f33d03d32d7110fe786583951d0b93c6e766
Author: juga0 
Date:   Tue Aug 28 14:45:28 2018 +

Add term used in the specification

and that can be also used in DEPLOY.rst
---
 docs/source/glossary.rst | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/docs/source/glossary.rst b/docs/source/glossary.rst
index eba3143..ab4bf29 100644
--- a/docs/source/glossary.rst
+++ b/docs/source/glossary.rst
@@ -23,6 +23,12 @@ Glossary
 :term:`bandwidth list file` s. Often used as a synomym for
 :term:`scanner`.
 
+   bandwidth list file
+The file generated by :term:`generator` s that is read by the
+:term:`directory authority` s and included in their votes.
+See `bandwidth-file-spec.txt 
`_
+to know about the file specification.
+
sbws scanner
 The sbws command that a :term:`bandwidth authority` runs continuously
 to gather information about how fast Tor relays are. The results from



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add term used in the specification

2018-09-05 Thread pastly 
commit 3e997cfa7b3b33ae6bf25e4266cb71fda7222abc
Author: juga0 
Date:   Tue Aug 28 14:45:13 2018 +

Add term used in the specification

and that can be also used in DEPLOY.rst
---
 docs/source/glossary.rst | 5 +
 1 file changed, 5 insertions(+)

diff --git a/docs/source/glossary.rst b/docs/source/glossary.rst
index 2658783..eba3143 100644
--- a/docs/source/glossary.rst
+++ b/docs/source/glossary.rst
@@ -18,6 +18,11 @@ Glossary
 It is also called :term:`generator` when it is the same tool that is
 used to generate :term:`bandwidth list file` s.
 
+   generator
+Term to refer to the tool that generates the
+:term:`bandwidth list file` s. Often used as a synomym for
+:term:`scanner`.
+
sbws scanner
 The sbws command that a :term:`bandwidth authority` runs continuously
 to gather information about how fast Tor relays are. The results from



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [sbws/master] Add term used in the specification

2018-09-05 Thread pastly 
commit 4338313b8ca277c6ad34ebfeaf5abc0195a576cc
Author: juga0 
Date:   Tue Aug 28 14:44:15 2018 +

Add term used in the specification

and that can be also used in DEPLOY.rst
---
 docs/source/glossary.rst | 5 +
 1 file changed, 5 insertions(+)

diff --git a/docs/source/glossary.rst b/docs/source/glossary.rst
index 6f0b98b..2658783 100644
--- a/docs/source/glossary.rst
+++ b/docs/source/glossary.rst
@@ -13,6 +13,11 @@ Glossary
 :term:`generator` or obtain :term:`bandwidth list file` s from a
 :term:`generator`.
 
+   scanner
+Term to refer to the process that measures the relays' bandwidth.
+It is also called :term:`generator` when it is the same tool that is
+used to generate :term:`bandwidth list file` s.
+
sbws scanner
 The sbws command that a :term:`bandwidth authority` runs continuously
 to gather information about how fast Tor relays are. The results from



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 27400 - Target Android API 26

2018-09-05 Thread gk 
commit 641dea421ec41553993b92d79a98394ae541f476
Author: Matthew Finkel 
Date:   Tue Sep 4 21:59:41 2018 +

Bug 27400 - Target Android API 26
---
 old-configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/old-configure.in b/old-configure.in
index b740691ab080..6ee9edb5b551 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2084,7 +2084,7 @@ dnl 

 
 case "$MOZ_BUILD_APP" in
 mobile/android)
-MOZ_ANDROID_SDK(23, 23, 26.0.2, 26.0.0 26.0.0-dev 25.3.2 25.3.1)
+MOZ_ANDROID_SDK(26, 26, 26.0.2, 26.0.0 26.0.0-dev 25.3.2 25.3.1)
 ;;
 esac
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

  1   2   3   >