[tor-commits] [bridgedb/develop] Merge branch 'fix/24443' into develop

[isis]

commit cb3f4b4aa27b527bfb000cc254d08622b90a526e
Merge: 76d3c5b 039884c
Author: Isis Lovecruft 
Date:   Mon Nov 27 23:26:17 2017 +

Merge branch 'fix/24443' into develop

 bridgedb/distributors/moat/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[tor-commits] [bridgedb/develop] Fix the moat server to only generate QRcodes when asked to do so.

[isis]

commit 039884c4f19bb3f52b076e1bc5901800b5258fe1
Author: Isis Lovecruft 
Date:   Mon Nov 27 23:22:33 2017 +

Fix the moat server to only generate QRcodes when asked to do so.

 * FIXES #24443: https://bugs.torproject.org/24443
---
 bridgedb/distributors/moat/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridgedb/distributors/moat/server.py 
b/bridgedb/distributors/moat/server.py
index daf62fa..eb356fe 100644
--- a/bridgedb/distributors/moat/server.py
+++ b/bridgedb/distributors/moat/server.py
@@ -560,7 +560,7 @@ class CaptchaCheckResource(CaptchaResource):
 "Transport '%s' is not currently supported" %
 data["transport"])
 else:
-qrcode = data["qrcode"]
+qrcode = True if data["qrcode"] == "true" else False
 transport = type('')(data["transport"])
 challenge = type('')(data["challenge"])
 solution = type('')(data["solution"])



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

[tor-commits] [bridgedb/develop] Make the test-moat script easier to input challenges and solutions.

[isis]

commit 8245b6a2c4f4697a33b1c169529aed66b6e1a55a
Author: Isis Lovecruft 
Date:   Mon Nov 27 19:13:54 2017 +

Make the test-moat script easier to input challenges and solutions.
---
 scripts/test-moat | 26 ++
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/scripts/test-moat b/scripts/test-moat
index 6bfa500..490edc6 100755
--- a/scripts/test-moat
+++ b/scripts/test-moat
@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 
+CHALLENGE=
+SOLUTION=
+
 function usage() {
-printf "Usage: %s [fetch] [check]\n" "$(basename $0)"
+printf "Usage: %s [fetch] [check [challenge solution]]\n" "$(basename $0)"
 }
 
 if test "$#" -lt 1 ; then
@@ -20,17 +23,32 @@ function do_fetch() {
 function do_check() {
 curl -H 'Content-Type: application/vnd.api+json' \
  -H 'Accept: application/vnd.api+json' \
- --data '{"data": [{"challenge": "foo", "solution": "bar", "version": 
"0.1.0", "qrcode": "false", "type": "moat-solution", "id": 2, "transport": 
"obfs4"}]}' \
+ --data '{"data": [{"challenge": "'$CHALLENGE'", "solution": 
"'$SOLUTION'", "version": "0.1.0", "qrcode": "false", "type": "moat-solution", 
"id": 2, "transport": "obfs4"}]}' \
  http://127.0.0.1:6790/meek/moat/check
 echo
 }
 
 while test -n "$1" ; do
+OPTSHIFT=1
+
 case "$1" in
 fetch) do_fetch ;;
-check) do_check ;;
+check) if [[ "$2" != "fetch" ]] ; then
+   CHALLENGE="$2"
+   if [[ "$3" != "fetch" ]] ; then
+   SOLUTION="$3"
+   fi
+   fi
+   for var in "$CHALLENGE" "$SOLUTION" ; do
+   if test -n "$var"; then
+   OPTSHIFT=$(( OPTSHIFT + 1 ))
+   fi
+   done
+   do_check ;;
+
 *) usage ;;
 esac
 
-shift
+shift $OPTSHIFT
+OPTSHIFT=1
 done



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

[tor-commits] [bridgedb/develop] Merge branch 'fix/24433' into develop

[isis]

commit 76d3c5bca779c78236a8dffb389304412e97af5e
Merge: 8245b6a a1597da
Author: Isis Lovecruft 
Date:   Mon Nov 27 19:38:27 2017 +

Merge branch 'fix/24433' into develop

 bridgedb/bridgerequest.py | 2 +-
 scripts/test-moat | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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

[tor-commits] [bridgedb/develop] Send correct X-Forwarded-For headers in test-moat script.

[isis]

commit a1597da01eb30e7222dc153a81cd7575a889f8ff
Author: Isis Lovecruft 
Date:   Mon Nov 27 19:30:03 2017 +

Send correct X-Forwarded-For headers in test-moat script.
---
 bridgedb/bridgerequest.py | 2 +-
 scripts/test-moat | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bridgedb/bridgerequest.py b/bridgedb/bridgerequest.py
index 560b704..e555e0a 100644
--- a/bridgedb/bridgerequest.py
+++ b/bridgedb/bridgerequest.py
@@ -149,7 +149,7 @@ class BridgeRequestBase(object):
 mod the number of nodes in the hashring.
 """
 if not client:
-client = self.client
+client = type('')(self.client)
 
 # Get an HMAC with the key of the client identifier:
 digest = getHMACFunc(key)(client)
diff --git a/scripts/test-moat b/scripts/test-moat
index 490edc6..13b835e 100755
--- a/scripts/test-moat
+++ b/scripts/test-moat
@@ -15,6 +15,7 @@ fi
 function do_fetch() {
 curl -H 'Content-Type: application/vnd.api+json' \
  -H 'Accept: application/vnd.api+json' \
+ -H 'X-Forwarded-For: 1.2.3.4' \
  --data '{"data": [{"supported": ["obfs4"], "version": "0.1.0", 
"type": "client-transports"}]}' \
  http://127.0.0.1:6790/meek/moat/fetch
 echo
@@ -23,6 +24,7 @@ function do_fetch() {
 function do_check() {
 curl -H 'Content-Type: application/vnd.api+json' \
  -H 'Accept: application/vnd.api+json' \
+ -H 'X-Forwarded-For: 1.2.3.4' \
  --data '{"data": [{"challenge": "'$CHALLENGE'", "solution": 
"'$SOLUTION'", "version": "0.1.0", "qrcode": "false", "type": "moat-solution", 
"id": 2, "transport": "obfs4"}]}' \
  http://127.0.0.1:6790/meek/moat/check
 echo



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

[tor-commits] [webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

[hiro]

commit c69eb984b93efb9779dd867787098b67f663852e
Merge: 1731e62d 3f17add4
Author: hiromipaw 
Date:   Mon Nov 27 20:41:21 2017 +0100

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 about/en/contributors.wml   |   3 -
 about/en/corepeople.wml | 152 
 css/people-table.css|  40 
 images/people/orig/redshiftzero.jpg | Bin 0 -> 51523 bytes
 images/people/redshiftzero.png  | Bin 0 -> 45395 bytes
 keys/redshiftzero.txt   | 191 
 6 files changed, 292 insertions(+), 94 deletions(-)

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

[tor-commits] [webwml/master] Remove broken link on donate options page

[hiro]

commit 1731e62da0de1e28fef357b56aa868cc53733a83
Author: hiromipaw 
Date:   Mon Nov 27 20:40:59 2017 +0100

Remove broken link on donate options page
---
 donate/en/donate-options.wml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml
index 898307ae..162574c9 100644
--- a/donate/en/donate-options.wml
+++ b/donate/en/donate-options.wml
@@ -133,8 +133,7 @@ form#makeDonation {
 
Donate via European Bank Transfer
For European bank transfers, we have an arrangement with
-the Renewable Freedom Foundation to provide
-http://www.solicitorsjournal.com/news/private-client/charities/gifts-foreign-charities-are-tax-deductible-ecj-rules;>tax-deductible
+the Renewable Freedom Foundation to provide tax-deductible
 donations for Europeans. They will issue a donation receipt https://renewablefreedom.org/contact/;>upon request. The
 account information is as follows:



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

[tor-commits] [webwml/master] Add giving assistant to donate options

[hiro]

commit 53906d0652d0b440fd746c8fa1ba4929cc204d2d
Author: hiromipaw 
Date:   Mon Nov 27 20:39:45 2017 +0100

Add giving assistant to donate options
---
 donate/en/donate-options.wml | 16 
 1 file changed, 16 insertions(+)

diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml
index 86b9af8f..898307ae 100644
--- a/donate/en/donate-options.wml
+++ b/donate/en/donate-options.wml
@@ -19,6 +19,7 @@ form#makeDonation {
 Bitcoin
 Amazon Payments
 https://smile.amazon.com/ch/20-8096820;>Amazon Smile
+https://givingassistant.org/np#tor-project-inc;>Giving 
Assistant
 EU Bank Transfer
 Checks or Money Orders
 Donate Stock
@@ -112,6 +113,21 @@ form#makeDonation {
   
 
 
+
+   
+   
+ 
+   Donate via Giving Assistant
+   Giving Assistant helps you donate a percentage of your cash back 
earnings to us with every purchase you make at 3,000+ popular online 
retailers.
+   
+  
+   https://givingassistant.org/np#tor-project-inc;>Use 
Giving Assistant to save money and support the Tor Project
+ 
+   
+
+  
+
+
 
 
 



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

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm]

commit fa726125402ffdd1084f46f82bf74aba162dbc2e
Merge: 36806e983 ef5461044
Author: Nick Mathewson 
Date:   Mon Nov 27 10:04:15 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/ticket23856 | 4 
 src/or/rephist.c| 4 ++--
 src/or/router.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

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

[tor-commits] [tor/release-0.3.2] relay: Change bandwidth stats interval to 24 hours

[nickm]

commit 8be50ca3ea90ac04b8a18c7d9a33f5ec3f3a6e28
Author: David Goulet 
Date:   Wed Nov 22 09:25:07 2017 -0500

relay: Change bandwidth stats interval to 24 hours

Going from 4 hours to 24 hours in order to try reduce the efficiency of 
guard
discovery attacks.

Closes #23856

Signed-off-by: David Goulet 
---
 changes/ticket23856 | 4 
 src/or/rephist.c| 4 ++--
 src/or/router.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/changes/ticket23856 b/changes/ticket23856
new file mode 100644
index 0..049da18d0
--- /dev/null
+++ b/changes/ticket23856
@@ -0,0 +1,4 @@
+  o Minor feature (relay statistics): 
+- Change relay bandwidth reporting stats interval from 4 hours to 24 hours
+  in order to reduce the efficiency of guard discovery attacks. Fixes
+  ticket 23856.
diff --git a/src/or/rephist.c b/src/or/rephist.c
index cedc56af0..5acc8f351 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -1131,9 +1131,9 @@ rep_hist_load_mtbf_data(time_t now)
  * totals? */
 #define NUM_SECS_ROLLING_MEASURE 10
 /** How large are the intervals for which we track and report bandwidth use? */
-#define NUM_SECS_BW_SUM_INTERVAL (4*60*60)
+#define NUM_SECS_BW_SUM_INTERVAL (24*60*60)
 /** How far in the past do we remember and publish bandwidth use? */
-#define NUM_SECS_BW_SUM_IS_VALID (24*60*60)
+#define NUM_SECS_BW_SUM_IS_VALID (5*24*60*60)
 /** How many bandwidth usage intervals do we remember? (derived) */
 #define NUM_TOTALS (NUM_SECS_BW_SUM_IS_VALID/NUM_SECS_BW_SUM_INTERVAL)
 
diff --git a/src/or/router.c b/src/or/router.c
index 90b2431a2..e1c2d20b3 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2064,7 +2064,7 @@ mark_my_descriptor_dirty(const char *reason)
 
 /** How frequently will we republish our descriptor because of large (factor
  * of 2) shifts in estimated bandwidth? */
-#define MAX_BANDWIDTH_CHANGE_FREQ (20*60)
+#define MAX_BANDWIDTH_CHANGE_FREQ (3*60*60)
 
 /** Check whether bandwidth has changed a lot since the last time we announced
  * bandwidth. If so, mark our descriptor dirty. */



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

[tor-commits] [tor/master] Merge branch 'ticket23856_025_01' into maint-0.3.2

[nickm]

commit ef54610442ee2f2a9143c6c55edb98da19cc3344
Merge: 4bb287aa3 8be50ca3e
Author: Nick Mathewson 
Date:   Mon Nov 27 10:02:03 2017 -0500

Merge branch 'ticket23856_025_01' into maint-0.3.2

 changes/ticket23856 | 4 
 src/or/rephist.c| 4 ++--
 src/or/router.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --cc src/or/router.c
index 8ad5d038e,e1c2d20b3..010ee339a
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2511,9 -2063,8 +2511,9 @@@ mark_my_descriptor_dirty(const char *re
  }
  
  /** How frequently will we republish our descriptor because of large (factor
 - * of 2) shifts in estimated bandwidth? */
 + * of 2) shifts in estimated bandwidth? Note: We don't use this constant
 + * if our previous bandwidth estimate was exactly 0. */
- #define MAX_BANDWIDTH_CHANGE_FREQ (20*60)
+ #define MAX_BANDWIDTH_CHANGE_FREQ (3*60*60)
  
  /** Check whether bandwidth has changed a lot since the last time we announced
   * bandwidth. If so, mark our descriptor dirty. */



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

[tor-commits] [tor/master] relay: Change bandwidth stats interval to 24 hours

[nickm]

commit 8be50ca3ea90ac04b8a18c7d9a33f5ec3f3a6e28
Author: David Goulet 
Date:   Wed Nov 22 09:25:07 2017 -0500

relay: Change bandwidth stats interval to 24 hours

Going from 4 hours to 24 hours in order to try reduce the efficiency of 
guard
discovery attacks.

Closes #23856

Signed-off-by: David Goulet 
---
 changes/ticket23856 | 4 
 src/or/rephist.c| 4 ++--
 src/or/router.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/changes/ticket23856 b/changes/ticket23856
new file mode 100644
index 0..049da18d0
--- /dev/null
+++ b/changes/ticket23856
@@ -0,0 +1,4 @@
+  o Minor feature (relay statistics): 
+- Change relay bandwidth reporting stats interval from 4 hours to 24 hours
+  in order to reduce the efficiency of guard discovery attacks. Fixes
+  ticket 23856.
diff --git a/src/or/rephist.c b/src/or/rephist.c
index cedc56af0..5acc8f351 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -1131,9 +1131,9 @@ rep_hist_load_mtbf_data(time_t now)
  * totals? */
 #define NUM_SECS_ROLLING_MEASURE 10
 /** How large are the intervals for which we track and report bandwidth use? */
-#define NUM_SECS_BW_SUM_INTERVAL (4*60*60)
+#define NUM_SECS_BW_SUM_INTERVAL (24*60*60)
 /** How far in the past do we remember and publish bandwidth use? */
-#define NUM_SECS_BW_SUM_IS_VALID (24*60*60)
+#define NUM_SECS_BW_SUM_IS_VALID (5*24*60*60)
 /** How many bandwidth usage intervals do we remember? (derived) */
 #define NUM_TOTALS (NUM_SECS_BW_SUM_IS_VALID/NUM_SECS_BW_SUM_INTERVAL)
 
diff --git a/src/or/router.c b/src/or/router.c
index 90b2431a2..e1c2d20b3 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2064,7 +2064,7 @@ mark_my_descriptor_dirty(const char *reason)
 
 /** How frequently will we republish our descriptor because of large (factor
  * of 2) shifts in estimated bandwidth? */
-#define MAX_BANDWIDTH_CHANGE_FREQ (20*60)
+#define MAX_BANDWIDTH_CHANGE_FREQ (3*60*60)
 
 /** Check whether bandwidth has changed a lot since the last time we announced
  * bandwidth. If so, mark our descriptor dirty. */



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

[tor-commits] [tor/maint-0.3.2] relay: Change bandwidth stats interval to 24 hours

[nickm]

commit 8be50ca3ea90ac04b8a18c7d9a33f5ec3f3a6e28
Author: David Goulet 
Date:   Wed Nov 22 09:25:07 2017 -0500

relay: Change bandwidth stats interval to 24 hours

Going from 4 hours to 24 hours in order to try reduce the efficiency of 
guard
discovery attacks.

Closes #23856

Signed-off-by: David Goulet 
---
 changes/ticket23856 | 4 
 src/or/rephist.c| 4 ++--
 src/or/router.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/changes/ticket23856 b/changes/ticket23856
new file mode 100644
index 0..049da18d0
--- /dev/null
+++ b/changes/ticket23856
@@ -0,0 +1,4 @@
+  o Minor feature (relay statistics): 
+- Change relay bandwidth reporting stats interval from 4 hours to 24 hours
+  in order to reduce the efficiency of guard discovery attacks. Fixes
+  ticket 23856.
diff --git a/src/or/rephist.c b/src/or/rephist.c
index cedc56af0..5acc8f351 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -1131,9 +1131,9 @@ rep_hist_load_mtbf_data(time_t now)
  * totals? */
 #define NUM_SECS_ROLLING_MEASURE 10
 /** How large are the intervals for which we track and report bandwidth use? */
-#define NUM_SECS_BW_SUM_INTERVAL (4*60*60)
+#define NUM_SECS_BW_SUM_INTERVAL (24*60*60)
 /** How far in the past do we remember and publish bandwidth use? */
-#define NUM_SECS_BW_SUM_IS_VALID (24*60*60)
+#define NUM_SECS_BW_SUM_IS_VALID (5*24*60*60)
 /** How many bandwidth usage intervals do we remember? (derived) */
 #define NUM_TOTALS (NUM_SECS_BW_SUM_IS_VALID/NUM_SECS_BW_SUM_INTERVAL)
 
diff --git a/src/or/router.c b/src/or/router.c
index 90b2431a2..e1c2d20b3 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2064,7 +2064,7 @@ mark_my_descriptor_dirty(const char *reason)
 
 /** How frequently will we republish our descriptor because of large (factor
  * of 2) shifts in estimated bandwidth? */
-#define MAX_BANDWIDTH_CHANGE_FREQ (20*60)
+#define MAX_BANDWIDTH_CHANGE_FREQ (3*60*60)
 
 /** Check whether bandwidth has changed a lot since the last time we announced
  * bandwidth. If so, mark our descriptor dirty. */



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

[tor-commits] [tor/release-0.3.2] Merge branch 'ticket23856_025_01' into maint-0.3.2

[nickm]

commit ef54610442ee2f2a9143c6c55edb98da19cc3344
Merge: 4bb287aa3 8be50ca3e
Author: Nick Mathewson 
Date:   Mon Nov 27 10:02:03 2017 -0500

Merge branch 'ticket23856_025_01' into maint-0.3.2

 changes/ticket23856 | 4 
 src/or/rephist.c| 4 ++--
 src/or/router.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --cc src/or/router.c
index 8ad5d038e,e1c2d20b3..010ee339a
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2511,9 -2063,8 +2511,9 @@@ mark_my_descriptor_dirty(const char *re
  }
  
  /** How frequently will we republish our descriptor because of large (factor
 - * of 2) shifts in estimated bandwidth? */
 + * of 2) shifts in estimated bandwidth? Note: We don't use this constant
 + * if our previous bandwidth estimate was exactly 0. */
- #define MAX_BANDWIDTH_CHANGE_FREQ (20*60)
+ #define MAX_BANDWIDTH_CHANGE_FREQ (3*60*60)
  
  /** Check whether bandwidth has changed a lot since the last time we announced
   * bandwidth. If so, mark our descriptor dirty. */



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

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm]

commit b23086060866c1541a607e0e9082ef9d9464549e
Merge: 722c64fc2 ef5461044
Author: Nick Mathewson 
Date:   Mon Nov 27 10:04:16 2017 -0500

Merge branch 'maint-0.3.2'

 changes/ticket23856 | 4 
 src/or/rephist.c| 4 ++--
 src/or/router.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

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

[tor-commits] [tor/maint-0.3.2] Merge branch 'ticket23856_025_01' into maint-0.3.2

[nickm]

commit ef54610442ee2f2a9143c6c55edb98da19cc3344
Merge: 4bb287aa3 8be50ca3e
Author: Nick Mathewson 
Date:   Mon Nov 27 10:02:03 2017 -0500

Merge branch 'ticket23856_025_01' into maint-0.3.2

 changes/ticket23856 | 4 
 src/or/rephist.c| 4 ++--
 src/or/router.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --cc src/or/router.c
index 8ad5d038e,e1c2d20b3..010ee339a
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2511,9 -2063,8 +2511,9 @@@ mark_my_descriptor_dirty(const char *re
  }
  
  /** How frequently will we republish our descriptor because of large (factor
 - * of 2) shifts in estimated bandwidth? */
 + * of 2) shifts in estimated bandwidth? Note: We don't use this constant
 + * if our previous bandwidth estimate was exactly 0. */
- #define MAX_BANDWIDTH_CHANGE_FREQ (20*60)
+ #define MAX_BANDWIDTH_CHANGE_FREQ (3*60*60)
  
  /** Check whether bandwidth has changed a lot since the last time we announced
   * bandwidth. If so, mark our descriptor dirty. */

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

[tor-commits] [tor/release-0.3.2] Add bastet's ipv6 address

[nickm]

commit 25c90230be25ec7f041501a033dcc932c3f9c83c
Author: Sebastian Hahn 
Date:   Thu Nov 23 07:37:56 2017 +0100

Add bastet's ipv6 address

Implements ticket 24394
---
 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/bastet_v6 b/changes/bastet_v6
new file mode 100644
index 0..ee4e2c809
--- /dev/null
+++ b/changes/bastet_v6
@@ -0,0 +1,4 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "bastet" directory authority.
+  Closes ticket 24394.
+
diff --git a/src/or/config.c b/src/or/config.c
index dd0eaa871..557790a81 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -931,6 +931,7 @@ static const char *default_authorities[] = {
 "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
   "bastet orport=443 "
 "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+"ipv6=[2620:13:4000:6000::1000:118]:443 "
 "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
   NULL
 };



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

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit 4bb287aa39d74e99dc319cd0a3fde88419340848
Merge: a7e777ab8 703ab95e9
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

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

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit 4bb287aa39d74e99dc319cd0a3fde88419340848
Merge: a7e777ab8 703ab95e9
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm]

commit b1c4ab0bec5b2b07e7e5358f449e352bb34c75d0
Merge: 2d849716d 30b322925
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm]

commit 36806e9830688973257f1f669ef8a751fa55757b
Merge: d084d3246 4bb287aa3
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

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

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 7c548437cc774880b314ae2d01d7b8fab009d397
Merge: bedd32e5d 703ab95e9
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

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

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 30b3229252709eeca054ee06cc6e366226723e24
Merge: 53c3174ee 25c90230b
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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

[tor-commits] [tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1

[nickm]

commit 703ab95e9fb94700b6349f539c58705040ede9a8
Merge: 735855952 b1c4ab0be
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

[nickm]

commit 703ab95e9fb94700b6349f539c58705040ede9a8
Merge: 735855952 b1c4ab0be
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 30b3229252709eeca054ee06cc6e366226723e24
Merge: 53c3174ee 25c90230b
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 30b3229252709eeca054ee06cc6e366226723e24
Merge: 53c3174ee 25c90230b
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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

[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

[nickm]

commit 6661c0352faf01460a0c3835ff342e6402796592
Merge: 28673a600 25c90230b
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm]

commit 722c64fc234e43d3b8d1facb327765d7b3518991
Merge: c2f413e24 4bb287aa3
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.3.2'

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

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

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 30b3229252709eeca054ee06cc6e366226723e24
Merge: 53c3174ee 25c90230b
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 30b3229252709eeca054ee06cc6e366226723e24
Merge: 53c3174ee 25c90230b
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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

[tor-commits] [tor/release-0.2.8] Add bastet's ipv6 address

[nickm]

commit 25c90230be25ec7f041501a033dcc932c3f9c83c
Author: Sebastian Hahn 
Date:   Thu Nov 23 07:37:56 2017 +0100

Add bastet's ipv6 address

Implements ticket 24394
---
 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/bastet_v6 b/changes/bastet_v6
new file mode 100644
index 0..ee4e2c809
--- /dev/null
+++ b/changes/bastet_v6
@@ -0,0 +1,4 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "bastet" directory authority.
+  Closes ticket 24394.
+
diff --git a/src/or/config.c b/src/or/config.c
index dd0eaa871..557790a81 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -931,6 +931,7 @@ static const char *default_authorities[] = {
 "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
   "bastet orport=443 "
 "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+"ipv6=[2620:13:4000:6000::1000:118]:443 "
 "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
   NULL
 };



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

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 30b3229252709eeca054ee06cc6e366226723e24
Merge: 53c3174ee 25c90230b
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[nickm]

commit c9a3525c7012cd2f58ad41cac82b767d322e8a34
Merge: e5cf65e8e 30b322925
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

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

[tor-commits] [tor/release-0.3.0] Add bastet's ipv6 address

[nickm]

commit 25c90230be25ec7f041501a033dcc932c3f9c83c
Author: Sebastian Hahn 
Date:   Thu Nov 23 07:37:56 2017 +0100

Add bastet's ipv6 address

Implements ticket 24394
---
 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/bastet_v6 b/changes/bastet_v6
new file mode 100644
index 0..ee4e2c809
--- /dev/null
+++ b/changes/bastet_v6
@@ -0,0 +1,4 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "bastet" directory authority.
+  Closes ticket 24394.
+
diff --git a/src/or/config.c b/src/or/config.c
index dd0eaa871..557790a81 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -931,6 +931,7 @@ static const char *default_authorities[] = {
 "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
   "bastet orport=443 "
 "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+"ipv6=[2620:13:4000:6000::1000:118]:443 "
 "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
   NULL
 };



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

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm]

commit b1c4ab0bec5b2b07e7e5358f449e352bb34c75d0
Merge: 2d849716d 30b322925
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

[nickm]

commit 703ab95e9fb94700b6349f539c58705040ede9a8
Merge: 735855952 b1c4ab0be
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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

[tor-commits] [tor/release-0.2.9] Add bastet's ipv6 address

[nickm]

commit 25c90230be25ec7f041501a033dcc932c3f9c83c
Author: Sebastian Hahn 
Date:   Thu Nov 23 07:37:56 2017 +0100

Add bastet's ipv6 address

Implements ticket 24394
---
 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/bastet_v6 b/changes/bastet_v6
new file mode 100644
index 0..ee4e2c809
--- /dev/null
+++ b/changes/bastet_v6
@@ -0,0 +1,4 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "bastet" directory authority.
+  Closes ticket 24394.
+
diff --git a/src/or/config.c b/src/or/config.c
index dd0eaa871..557790a81 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -931,6 +931,7 @@ static const char *default_authorities[] = {
 "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
   "bastet orport=443 "
 "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+"ipv6=[2620:13:4000:6000::1000:118]:443 "
 "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
   NULL
 };



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

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit 4bb287aa39d74e99dc319cd0a3fde88419340848
Merge: a7e777ab8 703ab95e9
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 98b28e789e9daa8729e5fd85eb7be1115b6c2067
Merge: 5926f14ec b1c4ab0be
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

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

[tor-commits] [tor/master] Add bastet's ipv6 address

[nickm]

commit 25c90230be25ec7f041501a033dcc932c3f9c83c
Author: Sebastian Hahn 
Date:   Thu Nov 23 07:37:56 2017 +0100

Add bastet's ipv6 address

Implements ticket 24394
---
 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/bastet_v6 b/changes/bastet_v6
new file mode 100644
index 0..ee4e2c809
--- /dev/null
+++ b/changes/bastet_v6
@@ -0,0 +1,4 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "bastet" directory authority.
+  Closes ticket 24394.
+
diff --git a/src/or/config.c b/src/or/config.c
index dd0eaa871..557790a81 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -931,6 +931,7 @@ static const char *default_authorities[] = {
 "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
   "bastet orport=443 "
 "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+"ipv6=[2620:13:4000:6000::1000:118]:443 "
 "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
   NULL
 };



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

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm]

commit b1c4ab0bec5b2b07e7e5358f449e352bb34c75d0
Merge: 2d849716d 30b322925
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

[nickm]

commit 703ab95e9fb94700b6349f539c58705040ede9a8
Merge: 735855952 b1c4ab0be
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

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

[tor-commits] [tor/maint-0.3.2] Add bastet's ipv6 address

[nickm]

commit 25c90230be25ec7f041501a033dcc932c3f9c83c
Author: Sebastian Hahn 
Date:   Thu Nov 23 07:37:56 2017 +0100

Add bastet's ipv6 address

Implements ticket 24394
---
 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/bastet_v6 b/changes/bastet_v6
new file mode 100644
index 0..ee4e2c809
--- /dev/null
+++ b/changes/bastet_v6
@@ -0,0 +1,4 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "bastet" directory authority.
+  Closes ticket 24394.
+
diff --git a/src/or/config.c b/src/or/config.c
index dd0eaa871..557790a81 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -931,6 +931,7 @@ static const char *default_authorities[] = {
 "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
   "bastet orport=443 "
 "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+"ipv6=[2620:13:4000:6000::1000:118]:443 "
 "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
   NULL
 };



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

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 30b3229252709eeca054ee06cc6e366226723e24
Merge: 53c3174ee 25c90230b
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

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

[tor-commits] [tor/maint-0.3.0] Add bastet's ipv6 address

[nickm]

commit 25c90230be25ec7f041501a033dcc932c3f9c83c
Author: Sebastian Hahn 
Date:   Thu Nov 23 07:37:56 2017 +0100

Add bastet's ipv6 address

Implements ticket 24394
---
 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/bastet_v6 b/changes/bastet_v6
new file mode 100644
index 0..ee4e2c809
--- /dev/null
+++ b/changes/bastet_v6
@@ -0,0 +1,4 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "bastet" directory authority.
+  Closes ticket 24394.
+
diff --git a/src/or/config.c b/src/or/config.c
index dd0eaa871..557790a81 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -931,6 +931,7 @@ static const char *default_authorities[] = {
 "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
   "bastet orport=443 "
 "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+"ipv6=[2620:13:4000:6000::1000:118]:443 "
 "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
   NULL
 };



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

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 30b3229252709eeca054ee06cc6e366226723e24
Merge: 53c3174ee 25c90230b
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm]

commit b1c4ab0bec5b2b07e7e5358f449e352bb34c75d0
Merge: 2d849716d 30b322925
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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

[tor-commits] [tor/maint-0.3.1] Add bastet's ipv6 address

[nickm]

commit 25c90230be25ec7f041501a033dcc932c3f9c83c
Author: Sebastian Hahn 
Date:   Thu Nov 23 07:37:56 2017 +0100

Add bastet's ipv6 address

Implements ticket 24394
---
 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/bastet_v6 b/changes/bastet_v6
new file mode 100644
index 0..ee4e2c809
--- /dev/null
+++ b/changes/bastet_v6
@@ -0,0 +1,4 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "bastet" directory authority.
+  Closes ticket 24394.
+
diff --git a/src/or/config.c b/src/or/config.c
index dd0eaa871..557790a81 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -931,6 +931,7 @@ static const char *default_authorities[] = {
 "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
   "bastet orport=443 "
 "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+"ipv6=[2620:13:4000:6000::1000:118]:443 "
 "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
   NULL
 };



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

[tor-commits] [tor/maint-0.2.9] Add bastet's ipv6 address

[nickm]

commit 25c90230be25ec7f041501a033dcc932c3f9c83c
Author: Sebastian Hahn 
Date:   Thu Nov 23 07:37:56 2017 +0100

Add bastet's ipv6 address

Implements ticket 24394
---
 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/bastet_v6 b/changes/bastet_v6
new file mode 100644
index 0..ee4e2c809
--- /dev/null
+++ b/changes/bastet_v6
@@ -0,0 +1,4 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "bastet" directory authority.
+  Closes ticket 24394.
+
diff --git a/src/or/config.c b/src/or/config.c
index dd0eaa871..557790a81 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -931,6 +931,7 @@ static const char *default_authorities[] = {
 "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
   "bastet orport=443 "
 "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+"ipv6=[2620:13:4000:6000::1000:118]:443 "
 "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
   NULL
 };



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

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 30b3229252709eeca054ee06cc6e366226723e24
Merge: 53c3174ee 25c90230b
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm]

commit b1c4ab0bec5b2b07e7e5358f449e352bb34c75d0
Merge: 2d849716d 30b322925
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

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

[tor-commits] [tor/maint-0.2.8] Add bastet's ipv6 address

[nickm]

commit 25c90230be25ec7f041501a033dcc932c3f9c83c
Author: Sebastian Hahn 
Date:   Thu Nov 23 07:37:56 2017 +0100

Add bastet's ipv6 address

Implements ticket 24394
---
 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/bastet_v6 b/changes/bastet_v6
new file mode 100644
index 0..ee4e2c809
--- /dev/null
+++ b/changes/bastet_v6
@@ -0,0 +1,4 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "bastet" directory authority.
+  Closes ticket 24394.
+
diff --git a/src/or/config.c b/src/or/config.c
index dd0eaa871..557790a81 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -931,6 +931,7 @@ static const char *default_authorities[] = {
 "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
   "bastet orport=443 "
 "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+"ipv6=[2620:13:4000:6000::1000:118]:443 "
 "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
   NULL
 };

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

[tor-commits] [atlas/master] Bump cache breaker

[irl]

commit c534d752731ad1102fda51b7c39c44aa9169cbe1
Author: Iain R. Learmonth 
Date:   Mon Nov 27 12:17:37 2017 +

Bump cache breaker
---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 1ef9d2b..283c208 100644
--- a/index.html
+++ b/index.html
@@ -41,7 +41,7 @@
   https://metrics.torproject.org/js/script.js";>
 
   
-  
+  
 
 
 
@@ -167,7 +167,7 @@ $('.cookie-message').cookieBar({ closeButton: '.cbc' });
 
 
   var require = {
-urlArgs: "v10"
+urlArgs: "v11"
   };
 
 

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

[tor-commits] [atlas/master] Adds an initial advanced search form (See: #23782)

[irl]

commit 4e86a0d1dc697325ddfe200cbc503617d98d3648
Author: Iain R. Learmonth 
Date:   Mon Nov 27 12:16:18 2017 +

Adds an initial advanced search form (See: #23782)
---
 css/atlas.css  | 10 ++
 js/router.js   |  6 
 js/views/search/main.js| 46 ++--
 templates/search/main.html | 88 ++
 4 files changed, 141 insertions(+), 9 deletions(-)

diff --git a/css/atlas.css b/css/atlas.css
index b027534..ac1c410 100644
--- a/css/atlas.css
+++ b/css/atlas.css
@@ -52,22 +52,18 @@ span.flags {
 background: #ff1515;
 }
 
-#home-search, #home-aggregate-search {
+#home-search, #home-aggregate-search, #home-advanced-search {
 padding: 0;
 margin: 0 0 10px 0;
 width: 100%;
 }
 
-.search-query {
-max-width: none;
-}
-
 td, th {
 padding: 2px!important;
 }
 
-table input {
-width: 100%;
+.form-control {
+max-width: none !important;
 }
 
 .flags-cell {
diff --git a/js/router.js b/js/router.js
index 8052f82..6b029bd 100644
--- a/js/router.js
+++ b/js/router.js
@@ -207,6 +207,12 @@ define([
   $('#aggregated-search-tab-content').fadeIn();
   $('.search-tabs').removeClass('active');
   $('#aggregated-search-tab').addClass('active');
+} else if (actions == "advanced") {
+  $('.search').hide();
+  $('#advanced-search-tab-content').fadeIn();
+  $('.search-tabs').removeClass('active');
+  $('#advanced-search-tab').addClass('active');
+  $('.well').hide();
 } else {
   $('.search').hide();
   $('#main-search-tab-content').fadeIn();
diff --git a/js/views/search/main.js b/js/views/search/main.js
index 6eedbe2..92ae96f 100644
--- a/js/views/search/main.js
+++ b/js/views/search/main.js
@@ -4,15 +4,16 @@ define([
   'underscore',
   'backbone',
   'text!templates/search/main.html',
+  'helpers',
 ], function($, _, Backbone, mainSearchTemplate){
   var mainSearchView = Backbone.View.extend({
el: "#content",
 
render: function(query){
document.title = "Relay Search";
-   var data = {};
+   var data = {countries: CountryCodes};
var compiledTemplate = _.template(mainSearchTemplate);
-   this.$el.html(compiledTemplate, data);
+   this.$el.html(compiledTemplate(data));
 
 $("#do-top-relays").bind('click', function(){
 document.location = "#toprelays";
@@ -43,6 +44,47 @@ define([
 document.location = 
"#aggregate/all/"+encodeURI($('#aggregated-query').val());
 return false;
 });
+
+var buildAdvancedQuery = function(){
+  var query = "";
+  if($('#advanced-search-nickname').val().trim() != "") query += 
$('#advanced-search-nickname').val().trim() + " ";
+  if($('#advanced-search-family')[0].checked) {
+if($('#advanced-search-fingerprint').val().trim() != "") query 
+= "family:" + $('#advanced-search-fingerprint').val().trim().split(" ")[0] + " 
";
+  } else {
+if($('#advanced-search-fingerprint').val().trim() != "") query 
+= "fingerprint:" + $('#advanced-search-fingerprint').val().trim().split(" 
")[0] + " ";
+  }
+  if($('#advanced-search-flag').val() !== "") query += "flag:" + 
$('#advanced-search-flag').val() + " ";
+  if($('#advanced-search-country').val() !== "") query += 
"country:" + $('#advanced-search-country').val() + " ";
+  if($('#advanced-search-as').val().trim() !== "") query += "as:" 
+ $('#advanced-search-as').val().trim() + " ";
+  if($('#advanced-search-contact').val().trim() != "") query += 
"contact:" + $('#advanced-search-contact').val().trim().split(" ")[0] + " ";
+  if($('#advanced-search-hostname').val().trim() != "") query += 
"host_name:" + $('#advanced-search-hostname').val().trim().split(" ")[0] + " ";
+  if($('#advanced-search-type').val() !== "") query += "type:" + 
$('#advanced-search-type').val() + " ";
+  if($('#advanced-search-running').val() !== "") query += 
"running:" + $('#advanced-search-running').val() + " ";
+  return query;
+}
+
+$("#do-advanced").bind('click', function(){
+var query = buildAdvancedQuery();
+document.location = "#search/"+encodeURI(query);
+});
+
+$("#do-advanced-aggregation").bind('click', function(){
+var query = buildAdvancedQuery();
+document.location = "#aggregate/all/"+encodeURI(query);
+});
+
+$("#do-advanced-aggregation-cc").bind('click', function(){
+var query = buildAdvancedQuery();
+document.location = "#aggregate/cc/"+encodeURI(query);
+});
+

[tor-commits] [tor-browser-build/master] Bug 24361: Bump rbm commit to pick up a fixup for 24361

[gk]

commit 57b65bcc24372b0d7eaff35bd8cf5089fd33b035
Author: Georg Koppen 
Date:   Mon Nov 27 11:46:01 2017 +

Bug 24361: Bump rbm commit to pick up a fixup for 24361
---
 rbm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rbm b/rbm
index a5a1748..5c89374 16
--- a/rbm
+++ b/rbm
@@ -1 +1 @@
-Subproject commit a5a1748894ae3e84cb81467b972010969f1b5c88
+Subproject commit 5c89374df7957238a9565c0b938ee3f30f880438

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

[tor-commits] [rbm/master] fixup! Bug 24361: use Path::Tiny instead of File::Slurp

[gk]

commit 5c89374df7957238a9565c0b938ee3f30f880438
Author: Georg Koppen 
Date:   Mon Nov 27 11:41:34 2017 +

fixup! Bug 24361: use Path::Tiny instead of File::Slurp
---
 lib/RBM.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/RBM.pm b/lib/RBM.pm
index b2ef57f..73b7d6c 100644
--- a/lib/RBM.pm
+++ b/lib/RBM.pm
@@ -707,7 +707,7 @@ sub input_file_need_dl {
 return undef if $action eq 'getfpaths';
 if ($fname
 && $input_file->{sha256sum}
-&& $t->('sha256sum') ne sha256_hex(read_file($fname))) {
+&& $t->('sha256sum') ne sha256_hex(path($fname)->slurp_raw)) {
 $fname = undef;
 }
 if ($action eq 'input_files_id') {

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

[tor-commits] [tor-browser-build/master] Bug 24361: fix Path::Tiny package name (File::Tiny => Path::Tiny)

[boklm]

commit 39b88a7e8b03877bf478cafd1b72e9abc5694ca6
Author: Nicolas Vigier 
Date:   Mon Nov 27 12:33:05 2017 +0100

Bug 24361: fix Path::Tiny package name (File::Tiny => Path::Tiny)
---
 README | 4 ++--
 tools/ansible/roles/tbb-builder/tasks/main.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 9639d2e..a449f9d 100644
--- a/README
+++ b/README
@@ -25,7 +25,7 @@ You also need a few perl modules installed:
 - IO::Handle
 - IO::CaptureOutput
 - File::Temp
-- File::Tiny
+- Path::Tiny
 - File::Path
 - File::Copy::Recursive
 - String::ShellQuote
@@ -38,7 +38,7 @@ If you are running Debian or Ubuntu, you can install them 
with:
 
 # apt-get install libyaml-libyaml-perl libtemplate-perl \
   libio-handle-util-perl libio-all-perl \
-  libio-captureoutput-perl libfile-tiny-perl \
+  libio-captureoutput-perl libpath-tiny-perl \
   libstring-shellquote-perl libsort-versions-perl \
   libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \
   libfile-copy-recursive-perl git libgtk2.0-dev curl runc
diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml 
b/tools/ansible/roles/tbb-builder/tasks/main.yml
index de8cce3..f27c6cf 100644
--- a/tools/ansible/roles/tbb-builder/tasks/main.yml
+++ b/tools/ansible/roles/tbb-builder/tasks/main.yml
@@ -12,7 +12,7 @@
   - libio-handle-util-perl
   - libio-all-perl
   - libio-captureoutput-perl
-  - libfile-tiny-perl
+  - libpath-tiny-perl
   - libstring-shellquote-perl
   - libsort-versions-perl
   - libdigest-sha-perl

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

[tor-commits] [tor-browser-build/master] Bug 24361: Bump rbm commit

[gk]

commit a6d54303ad89af777a4994dc27d0ae90945f090c
Author: Georg Koppen 
Date:   Mon Nov 27 11:17:30 2017 +

Bug 24361: Bump rbm commit

Furthermore we adapt the README and our ansible main.yml to take care of
removing File::Slurp from our build dependencies and replacing it with
Path::Tiny
---
 README | 4 ++--
 rbm| 2 +-
 tools/ansible/roles/tbb-builder/tasks/main.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 5b4a2bc..9639d2e 100644
--- a/README
+++ b/README
@@ -25,7 +25,7 @@ You also need a few perl modules installed:
 - IO::Handle
 - IO::CaptureOutput
 - File::Temp
-- File::Slurp
+- File::Tiny
 - File::Path
 - File::Copy::Recursive
 - String::ShellQuote
@@ -38,7 +38,7 @@ If you are running Debian or Ubuntu, you can install them 
with:
 
 # apt-get install libyaml-libyaml-perl libtemplate-perl \
   libio-handle-util-perl libio-all-perl \
-  libio-captureoutput-perl libfile-slurp-perl \
+  libio-captureoutput-perl libfile-tiny-perl \
   libstring-shellquote-perl libsort-versions-perl \
   libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \
   libfile-copy-recursive-perl git libgtk2.0-dev curl runc
diff --git a/rbm b/rbm
index 236fcaa..a5a1748 16
--- a/rbm
+++ b/rbm
@@ -1 +1 @@
-Subproject commit 236fcaac2012531330f21d2e9cce49a534a03b60
+Subproject commit a5a1748894ae3e84cb81467b972010969f1b5c88
diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml 
b/tools/ansible/roles/tbb-builder/tasks/main.yml
index f3a857c..de8cce3 100644
--- a/tools/ansible/roles/tbb-builder/tasks/main.yml
+++ b/tools/ansible/roles/tbb-builder/tasks/main.yml
@@ -12,7 +12,7 @@
   - libio-handle-util-perl
   - libio-all-perl
   - libio-captureoutput-perl
-  - libfile-slurp-perl
+  - libfile-tiny-perl
   - libstring-shellquote-perl
   - libsort-versions-perl
   - libdigest-sha-perl

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

[tor-commits] [rbm/master] Merge remote-tracking branch 'boklm/bug_24361'

[gk]

commit a5a1748894ae3e84cb81467b972010969f1b5c88
Merge: 6406e06 8b6831b
Author: Georg Koppen 
Date:   Mon Nov 27 11:06:25 2017 +

Merge remote-tracking branch 'boklm/bug_24361'

 lib/RBM.pm | 69 --
 test.pl|  4 ++--
 2 files changed, 38 insertions(+), 35 deletions(-)

diff --cc lib/RBM.pm
index 7850817,9080ccf..b2ef57f
--- a/lib/RBM.pm
+++ b/lib/RBM.pm
@@@ -836,10 -832,12 +839,10 @@@ sub input_files 
  if $input_file->{project};
  exit_error("Missing filename:\n" . pp($input_file)) unless $name;
  my ($fname) = file_in_dir($name, $src_dir, $proj_out_dir);
 -$need_dl = input_file_id_need_dl($input_file, $t, $fname)
 -if $action eq 'input_files_id';
  my $file_gpg_id = gpg_id($t->('file_gpg_id'));
 -if ($need_dl && (!$fname || $t->('refresh_input'))) {
 +if (input_file_need_dl($input_file, $t, $fname, $action)) {
  if ($t->('content')) {
- write_file("$proj_out_dir/$name", $t->('content'));
+ path("$proj_out_dir/$name")->spew_utf8($t->('content'));
  } elsif ($t->('URL')) {
  urlget($project, {%$input_file, filename => $name}, 1);
  } elsif ($t->('exec')) {

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

[tor-commits] [rbm/master] Bug 24361: use Path::Tiny instead of File::Slurp

[gk]

commit 8b6831b36becc697fc53e61cac058d18096ea4b9
Author: Nicolas Vigier 
Date:   Tue Nov 21 17:13:01 2017 +0100

Bug 24361: use Path::Tiny instead of File::Slurp

When a build script contains some wide character, rbm fails with an
error:
  Wide character in syswrite at /usr/share/perl5/File/Slurp.pm line 506.

This is because write_file from File::Slurp which we use to write the
build scripts is encoding files to latin-1 by default. While fixing this,
switching to Path::Tiny instead of File::Slurp seems like a good idea:

http://blogs.perl.org/users/leon_timmermans/2015/08/fileslurp-is-broken-and-wrong.html

Switching to Path::Tiny is also improving performance:

  When using File::Slurp:

$ time ./rbm/rbm showconf --target alpha --target 
torbrowser-linux-x86_64 tor-browser var/build_id
82b8cb

real0m28.543s
user0m24.448s
sys 0m3.956s

  When using Path::Tiny:

$ time ~/rbm/rbm showconf --target alpha --target 
torbrowser-linux-x86_64 tor-browser var/build_id
82b8cb

real0m15.745s
user0m13.940s
sys 0m1.940s

The path function in lib/RBM.pm is conflicting with the path constructor
from Path::Tiny, so we rename it to rbm_path.
---
 lib/RBM.pm | 64 +++---
 test.pl|  4 ++--
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/lib/RBM.pm b/lib/RBM.pm
index 3134efe..9080ccf 100644
--- a/lib/RBM.pm
+++ b/lib/RBM.pm
@@ -2,6 +2,7 @@ package RBM;
 
 use warnings;
 use strict;
+use Path::Tiny;
 use Encode qw(encode);
 use Cwd qw(getcwd);
 use YAML::XS qw(LoadFile);
@@ -12,7 +13,6 @@ use IO::CaptureOutput qw(capture_exec);
 use File::Temp;
 use File::Copy;
 use File::Copy::Recursive qw(fcopy);
-use File::Slurp;
 use File::Path qw(make_path);
 use File::Basename;
 use String::ShellQuote;
@@ -50,7 +50,7 @@ sub load_config {
 $config->{step} = 'rbm_init';
 $config->{opt} = {};
 my $pdir = $config->{projects_dir} || $config->{default}{projects_dir};
-foreach my $p (glob path($pdir) . '/*') {
+foreach my $p (glob rbm_path($pdir) . '/*') {
 next unless -f "$p/config";
 $config->{projects}{basename($p)} = load_config_file("$p/config");
 }
@@ -65,7 +65,7 @@ sub load_system_config {
 sub load_local_config {
 my ($project) = @_;
 my $cfile = project_config($project ? $project : 'undef', 
'localconf_file');
-$cfile = path($cfile);
+$cfile = rbm_path($cfile);
 $config->{local} = -f $cfile ? load_config_file($cfile) : {};
 }
 
@@ -80,7 +80,7 @@ sub set_default_env {
 %ENV = (%ENV, %{$config->{ENV}}) if ref $config->{ENV} eq 'HASH';
 }
 
-sub path {
+sub rbm_path {
 my ($path, $basedir) = @_;
 $basedir //= $config->{basedir};
 return ( $path =~ m|^/| ) ? $path : "$basedir/$path";
@@ -271,7 +271,7 @@ sub set_git_gpg_wrapper {
 my ($project) = @_;
 my $w = project_config($project, 'gpg_wrapper');
 my (undef, $tmp) = File::Temp::tempfile(DIR => get_tmp_dir($project));
-write_file($tmp, $w);
+path($tmp)->spew_utf8($w);
 chmod 0700, $tmp;
 system('git', 'config', 'gpg.program', $tmp) == 0
 || exit_error 'Error setting gpg.program';
@@ -322,7 +322,7 @@ sub file_sign_id {
 my ($project, $options) = @_;
 my (undef, $gpg_wrapper) = File::Temp::tempfile(DIR =>
 get_tmp_dir($project, $options));
-write_file($gpg_wrapper, project_config($project, 'gpg_wrapper', 
$options));
+path($gpg_wrapper)->spew_utf8(project_config($project, 'gpg_wrapper', 
$options));
 chmod 0700, $gpg_wrapper;
 my ($stdout, $stderr, $success, $exit_code) =
 capture_exec($gpg_wrapper, '--verify',
@@ -377,7 +377,7 @@ sub git_need_fetch {
 
 sub git_clone_fetch_chdir {
 my ($project, $options) = @_;
-my $clonedir = create_dir(path(project_config($project,
+my $clonedir = create_dir(rbm_path(project_config($project,
 'git_clone_dir', $options)));
 my $git_url = project_config($project, 'git_url', $options)
 || exit_error "git_url is undefined";
@@ -387,7 +387,7 @@ sub git_clone_fetch_chdir {
 @clone_submod = ('--recurse-submodules');
 @fetch_submod = ('--recurse-submodules=on-demand');
 }
-if (!chdir path("$clonedir/$project")) {
+if (!chdir rbm_path("$clonedir/$project")) {
 chdir $clonedir || exit_error "Can't enter directory $clonedir: $!";
 if (system('git', 'clone', @clone_submod, $git_url, $project) != 0) {
 exit_error "Error cloning $git_url";
@@ -429,12 +429,12 @@ sub hg_need_fetch {
 sub hg_clone_fetch_chdir {
 my ($project, $options) = @_;
 my $hg = project_config($project, 'hg', $options);
-my $clonedir = create_dir(path(project_config($project,
+my $clonedir = 

[tor-commits] [rbm/master] Bug 24361: fix handling of wide characters in sha256

[gk]

commit 134cad4e79471d7baa82f00b4a6e2d7f7d11868a
Author: Nicolas Vigier 
Date:   Mon Nov 20 17:55:23 2017 +0100

Bug 24361: fix handling of wide characters in sha256

The sha256_hex function gives an error if a string contains wide
characters. To avoid this we first encode the string to utf8 (which
transforms it to a sequence of octets), before passing it to sha256_hex.
---
 lib/RBM.pm | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/RBM.pm b/lib/RBM.pm
index 96a1b9b..3134efe 100644
--- a/lib/RBM.pm
+++ b/lib/RBM.pm
@@ -2,6 +2,7 @@ package RBM;
 
 use warnings;
 use strict;
+use Encode qw(encode);
 use Cwd qw(getcwd);
 use YAML::XS qw(LoadFile);
 use Template;
@@ -639,7 +640,9 @@ sub process_template {
 tmpl   => sub { process_template($project, $_[0], $dest_dir) },
 shell_quote => \_quote,
 versioncmp  => \,
-sha256  => \_hex,
+sha256  => sub {
+return sha256_hex(encode("utf8", $_[0]));
+},
 sha256file  => \,
 fileparse   => \,
 ENV => \%ENV,



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

[tor-commits] [tor-browser-build/master] Bug 24179: Use HTTPS-Everywhere release for nightly builds

[boklm]

commit ef2487d3aae2adff9d42a850c39d15e055c6735e
Author: Georg Koppen 
Date:   Mon Nov 27 09:49:03 2017 +

Bug 24179: Use HTTPS-Everywhere release for nightly builds
---
 projects/https-everywhere/config | 5 -
 1 file changed, 5 deletions(-)

diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 5225bbc..237272b 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -32,8 +32,3 @@ var:
 
 input_files:
   - project: container-image
-
-targets:
-  nightly:
-version: master
-tag_gpg_id: 0

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

[tor-commits] [rbm/master] Bug 24180: Make 'rbm fetch' accept options

[gk]

commit 6406e0684a379d1316f747ed57060925efaf
Author: Nicolas Vigier 
Date:   Wed Nov 8 14:32:04 2017 +0100

Bug 24180: Make 'rbm fetch' accept options
---
 doc/rbm-fetch.asc | 7 ++-
 rbm   | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/rbm-fetch.asc b/doc/rbm-fetch.asc
index 17a41e6..f0da55e 100644
--- a/doc/rbm-fetch.asc
+++ b/doc/rbm-fetch.asc
@@ -9,7 +9,7 @@ rbm-fetch - Fetch commits from remote git or mercurial 
repository
 SYNOPSIS
 
 [verse]
-'rbm fetch' [project]
+'rbm fetch' [options] [project]
 
 DESCRIPTION
 ---
@@ -23,6 +23,11 @@ fetched, so there is no need to use this command.
 
 Alternatively, the '--fetch' option can be used on other commands.
 
+COMMAND LINE OPTIONS
+
+
+See link:rbm_cli.html[rbm_cli(7)] for options.
+
 SEE ALSO
 
 link:rbm.html[rbm(1)]
diff --git a/rbm b/rbm
index 2c4ad0d..5d6417b 100755
--- a/rbm
+++ b/rbm
@@ -131,7 +131,8 @@ sub show_conf {
 sub fetch {
 shift;
 $RBM::config->{run}{fetch} = 1;
-my @l = @_ ? @_ : (RBM::projectslist());
+my $args = set_options(@_);
+my @l = @$args ? @$args : (RBM::projectslist());
 foreach my $project (@l) {
 RBM::valid_project($project);
 if (RBM::project_config($project, 'git_url')) {

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

[tor-commits] [onionoo/master] Extend "version" parameter to bridges.

[karsten]

commit 919d5ff967ecaa401b8a0a91885fbe7b84c9807c
Author: Karsten Loesing 
Date:   Sat Nov 18 17:35:30 2017 +0100

Extend "version" parameter to bridges.

Extend the "version" parameter to also return bridges with the given
version or version prefix.

Implements #23962.
---
 CHANGELOG.md   |  2 ++
 .../org/torproject/onionoo/server/NodeIndex.java   | 10 
 .../org/torproject/onionoo/server/NodeIndexer.java | 10 
 .../torproject/onionoo/server/RequestHandler.java  |  9 ++-
 .../onionoo/server/ResourceServletTest.java| 29 +-
 5 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3adcdd4..918a1ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
  software version listed in the consensus and similarly to bridge
  details documents with the Tor software version found in the
  server descriptor.
+   - Extend the "version" parameter to also return bridges with the
+ given version or version prefix.
 
 
 # Changes in version 4.3-1.7.1 - 2017-11-17
diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndex.java 
b/src/main/java/org/torproject/onionoo/server/NodeIndex.java
index 126cd5c..c41dd7a 100644
--- a/src/main/java/org/torproject/onionoo/server/NodeIndex.java
+++ b/src/main/java/org/torproject/onionoo/server/NodeIndex.java
@@ -180,6 +180,16 @@ class NodeIndex {
 return this.relaysByVersion;
   }
 
+  private Map bridgesByVersion;
+
+  public void setBridgesByVersion(Map bridgesByVersion) {
+this.bridgesByVersion = bridgesByVersion;
+  }
+
+  public Map getBridgesByVersion() {
+return this.bridgesByVersion;
+  }
+
   private Map relaysByHostName;
 
   public void setRelaysByHostName(Map relaysByHostName) {
diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java 
b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java
index d609f63..585d33f 100644
--- a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java
+++ b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java
@@ -154,6 +154,7 @@ public class NodeIndexer implements ServletContextListener, 
Runnable {
 Map newRelaysByContact = new HashMap<>();
 Map newRelaysByFamily = new HashMap<>();
 Map newRelaysByVersion = new HashMap<>();
+Map newBridgesByVersion = new HashMap<>();
 Map newRelaysByHostName = new HashMap<>();
 SortedMap newRelaysByFirstSeenDays = new TreeMap<>();
 SortedMap newBridgesByFirstSeenDays = new 
TreeMap<>();
@@ -323,6 +324,14 @@ public class NodeIndexer implements 
ServletContextListener, Runnable {
   hashedFingerprint);
   newBridgesByLastSeenDays.get(daysSinceLastSeen).add(
   hashedHashedFingerprint);
+  String version = entry.getVersion();
+  if (null != version) {
+if (!newBridgesByVersion.containsKey(version)) {
+  newBridgesByVersion.put(version, new HashSet<>());
+}
+newBridgesByVersion.get(version).add(hashedFingerprint);
+newBridgesByVersion.get(version).add(hashedHashedFingerprint);
+  }
 }
 NodeIndex newNodeIndex = new NodeIndex();
 newNodeIndex.setRelayFingerprintSummaryLines(
@@ -342,6 +351,7 @@ public class NodeIndexer implements ServletContextListener, 
Runnable {
 newNodeIndex.setRelaysPublishedMillis(relaysLastValidAfterMillis);
 newNodeIndex.setBridgesPublishedMillis(bridgesLastPublishedMillis);
 newNodeIndex.setRelaysByVersion(newRelaysByVersion);
+newNodeIndex.setBridgesByVersion(newBridgesByVersion);
 newNodeIndex.setRelaysByHostName(newRelaysByHostName);
 synchronized (this) {
   this.lastIndexed = updateStatusMillis;
diff --git a/src/main/java/org/torproject/onionoo/server/RequestHandler.java 
b/src/main/java/org/torproject/onionoo/server/RequestHandler.java
index 23af60b..067a738 100644
--- a/src/main/java/org/torproject/onionoo/server/RequestHandler.java
+++ b/src/main/java/org/torproject/onionoo/server/RequestHandler.java
@@ -541,7 +541,14 @@ public class RequestHandler {
   }
 }
 this.filteredRelays.keySet().retainAll(keepRelays);
-this.filteredBridges.clear();
+Set keepBridges = new HashSet<>();
+for (Map.Entry e
+: this.nodeIndex.getBridgesByVersion().entrySet()) {
+  if (e.getKey().startsWith(this.version)) {
+keepBridges.addAll(e.getValue());
+  }
+}
+this.filteredBridges.keySet().retainAll(keepBridges);
   }
 
   private void filterByHostName() {
diff --git 
a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java 
b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java
index 2720f7a..d763988 100644
--- 

[tor-commits] [onionoo/master] Add "recommended_version" field to bridge details documents.

[karsten]

commit edc796cd890fdc656947dd11c6832a5d99ee0ae6
Author: Karsten Loesing 
Date:   Sat Nov 18 17:37:46 2017 +0100

Add "recommended_version" field to bridge details documents.

Add a "recommended_version" field to bridge details documents based on
whether the directory authorities recommend the bridge's version.

Implements #21827.
---
 CHANGELOG.md   |  3 +++
 .../onionoo/updater/NodeDetailsStatusUpdater.java  | 24 --
 .../onionoo/writer/DetailsDocumentWriter.java  |  2 ++
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 918a1ae..5a84259 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@
  server descriptor.
- Extend the "version" parameter to also return bridges with the
  given version or version prefix.
+   - Add a "recommended_version" field to bridge details documents
+ based on whether the directory authorities recommend the bridge's
+ version.
 
 
 # Changes in version 4.3-1.7.1 - 2017-11-17
diff --git 
a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java 
b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
index 7792764..0a5a93d 100644
--- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
+++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
@@ -89,6 +89,8 @@ public class NodeDetailsStatusUpdater implements 
DescriptorListener,
 
   private SortedMap lastBandwidthWeights = null;
 
+  private Set lastRecommendedServerVersions = null;
+
   private int relayConsensusesProcessed = 0;
 
   private int bridgeStatusesProcessed = 0;
@@ -248,14 +250,6 @@ public class NodeDetailsStatusUpdater implements 
DescriptorListener,
 if (validAfterMillis > this.relaysLastValidAfterMillis) {
   this.relaysLastValidAfterMillis = validAfterMillis;
 }
-Set recommendedVersions = null;
-if (consensus.getRecommendedServerVersions() != null) {
-  recommendedVersions = new HashSet<>();
-  for (String recommendedVersion :
-  consensus.getRecommendedServerVersions()) {
-recommendedVersions.add("Tor " + recommendedVersion);
-  }
-}
 for (Map.Entry e :
 consensus.getStatusEntries().entrySet()) {
   String fingerprint = e.getKey();
@@ -288,9 +282,6 @@ public class NodeDetailsStatusUpdater implements 
DescriptorListener,
 nodeStatus.setConsensusWeight(entry.getBandwidth());
 nodeStatus.setDefaultPolicy(entry.getDefaultPolicy());
 nodeStatus.setPortList(entry.getPortList());
-nodeStatus.setRecommendedVersion((recommendedVersions == null
-|| entry.getVersion() == null) ? null :
-recommendedVersions.contains(entry.getVersion()));
 String version = null;
 if (null != entry.getVersion()
 && entry.getVersion().startsWith("Tor ")) {
@@ -315,6 +306,8 @@ public class NodeDetailsStatusUpdater implements 
DescriptorListener,
 this.relayConsensusesProcessed++;
 if (this.relaysLastValidAfterMillis == validAfterMillis) {
   this.lastBandwidthWeights = consensus.getBandwidthWeights();
+  this.lastRecommendedServerVersions
+  = new HashSet<>(consensus.getRecommendedServerVersions());
 }
   }
 
@@ -800,6 +793,15 @@ public class NodeDetailsStatusUpdater implements 
DescriptorListener,
 nodeStatus.setVersion(version);
   }
 
+  /* Compare tor software version (for relays and bridges) with the
+   * recommended-server-versions line in the last known consensus and set
+   * the recommended_version field accordingly. */
+  if (null != this.lastRecommendedServerVersions
+  && null != nodeStatus.getVersion()) {
+nodeStatus.setRecommendedVersion(this.lastRecommendedServerVersions
+.contains(nodeStatus.getVersion()));
+  }
+
   Map exitAddresses = new HashMap<>();
   if (detailsStatus.getExitAddresses() != null) {
 for (Map.Entry e :
diff --git 
a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java 
b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java
index 5eaa950..1b53ffe 100644
--- a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java
+++ b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java
@@ -189,6 +189,8 @@ public class DetailsDocumentWriter implements 
DocumentWriter {
 detailsDocument.setFirstSeen(detailsStatus.getFirstSeenMillis());
 detailsDocument.setRunning(detailsStatus.isRunning());
 detailsDocument.setFlags(detailsStatus.getRelayFlags());
+detailsDocument.setRecommendedVersion(
+detailsStatus.getRecommendedVersion());
 detailsDocument.setLastRestarted(detailsStatus.getLastRestarted());
 

[tor-commits] [onionoo/master] Add "version" field to details documents.

[karsten]

commit bd5b45a79cc71410c66b776c44d52f7f2e84a117
Author: Karsten Loesing 
Date:   Sat Nov 18 17:32:27 2017 +0100

Add "version" field to details documents.

Add a "version" field to relay details documents with the Tor software
version listed in the consensus and similarly to bridge details
documents with the Tor software version found in the server
descriptor.

Implements #22488.
---
 CHANGELOG.md  |  9 +
 .../org/torproject/onionoo/docs/DetailsDocument.java  | 10 ++
 .../org/torproject/onionoo/docs/DetailsStatus.java| 10 ++
 .../java/org/torproject/onionoo/docs/NodeStatus.java  |  3 +--
 .../torproject/onionoo/server/ResponseBuilder.java|  2 ++
 .../onionoo/updater/NodeDetailsStatusUpdater.java | 19 ++-
 .../onionoo/writer/DetailsDocumentWriter.java |  2 ++
 7 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eef02a8..3adcdd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# Changes in version 4.4-1.8.0 - 2017-??-??
+
+ * Medium changes
+   - Add a "version" field to relay details documents with the Tor
+ software version listed in the consensus and similarly to bridge
+ details documents with the Tor software version found in the
+ server descriptor.
+
+
 # Changes in version 4.3-1.7.1 - 2017-11-17
 
  * Minor changes
diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java 
b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
index bde3cae..911a978 100644
--- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
+++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
@@ -346,6 +346,16 @@ public class DetailsDocument extends Document {
 return unescapeJson(this.platform);
   }
 
+  private String version;
+
+  public void setVersion(String version) {
+this.version = version;
+  }
+
+  public String getVersion() {
+return this.version;
+  }
+
   private SortedSet alleged_family;
 
   public void setAllegedFamily(SortedSet allegedFamily) {
diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java 
b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java
index 77ff75f..9ed8658 100644
--- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java
+++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java
@@ -540,5 +540,15 @@ public class DetailsStatus extends Document {
   public List getAdvertisedOrAddresses() {
 return this.advertised_or_addresses;
   }
+
+  private String version;
+
+  public void setVersion(String version) {
+this.version = version;
+  }
+
+  public String getVersion() {
+return this.version;
+  }
 }
 
diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java 
b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
index 3271ccc..7a8510e 100644
--- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
+++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
@@ -324,8 +324,7 @@ public class NodeStatus extends Document {
   private String version;
 
   public void setVersion(String version) {
-this.version = null == version ? null
-: version.substring(version.lastIndexOf(" ") + 1);
+this.version = version;
   }
 
   public String getVersion() {
diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java 
b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
index 58b66ce..a83234b 100644
--- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
+++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
@@ -342,6 +342,8 @@ public class ResponseBuilder {
   } else if (field.equals("unreachable_or_addresses")) {
 dd.setUnreachableOrAddresses(
 detailsDocument.getUnreachableOrAddresses());
+  } else if (field.equals("version")) {
+dd.setVersion(detailsDocument.getVersion());
   }
 }
 /* Don't escape HTML characters, like < and >, contained in
diff --git 
a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java 
b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
index fa3f3af..7792764 100644
--- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
+++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
@@ -291,7 +291,12 @@ public class NodeDetailsStatusUpdater implements 
DescriptorListener,
 nodeStatus.setRecommendedVersion((recommendedVersions == null
 || entry.getVersion() == null) ? null :
 recommendedVersions.contains(entry.getVersion()));
-nodeStatus.setVersion(entry.getVersion());
+String version = null;
+if (null != entry.getVersion()
+&& entry.getVersion().startsWith("Tor ")) {
+  version = 

[tor-commits] [metrics-web/master] Update news.json to version 196 of doc/MetricsTimeline.

[karsten]

commit 3a28645ac3b51fe7727926fbd2924324cb4beacc
Author: Karsten Loesing 
Date:   Mon Nov 27 10:02:03 2017 +0100

Update news.json to version 196 of doc/MetricsTimeline.
---
 website/src/main/resources/etc/news.json | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/website/src/main/resources/etc/news.json 
b/website/src/main/resources/etc/news.json
index fd290be..1f7bf0a 100644
--- a/website/src/main/resources/etc/news.json
+++ b/website/src/main/resources/etc/news.json
@@ -2770,6 +2770,17 @@
 ]
   },
   {
+"start": "2017-11-25",
+"places": [
+  "pk"
+],
+"description": "Social media block in Pakistan.",
+"links": [
+  "https://dailytimes.com.pk/147132/social-media-goes-down-in-pakistan/\;>article",
+  "https://digitalrightsfoundation.pk/press-release-drf-and-netblocks-find-blanket-and-nation-wide-ban-on-social-media-in-pakistan-and-demand-it-to-be-lifted-immediately/\;>NetBlocks
 data"
+]
+  },
+  {
 "start": "2016-02-24",
 "places": [
   "tm"

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

[tor-commits] [onionoo/master] Add "recommended_version" parameter.

[karsten]

commit 11e5bbd80c24bb6c11ab3450d208517d4d145780
Author: Karsten Loesing 
Date:   Sat Nov 18 20:43:59 2017 +0100

Add "recommended_version" parameter.

Add a "recommended_version" parameter to return only relays and
bridges running a Tor software version that is recommended or not
recommended by the directory authorities.

Implements #23544.
---
 CHANGELOG.md   |  3 ++
 .../org/torproject/onionoo/docs/DocumentStore.java |  4 ++-
 .../torproject/onionoo/docs/SummaryDocument.java   | 16 +-
 .../org/torproject/onionoo/server/NodeIndex.java   | 22 +
 .../org/torproject/onionoo/server/NodeIndexer.java | 21 +
 .../torproject/onionoo/server/RequestHandler.java  | 20 
 .../torproject/onionoo/server/ResourceServlet.java | 19 ++--
 .../onionoo/writer/SummaryDocumentWriter.java  |  3 +-
 .../onionoo/docs/SummaryDocumentTest.java  |  2 +-
 .../onionoo/server/ResourceServletTest.java| 36 ++
 .../server/SummaryDocumentComparatorTest.java  |  2 +-
 11 files changed, 134 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a84259..8acdc0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,9 @@
- Add a "recommended_version" field to bridge details documents
  based on whether the directory authorities recommend the bridge's
  version.
+   - Add a "recommended_version" parameter to return only relays and
+ bridges running a Tor software version that is recommended or not
+ recommended by the directory authorities.
 
 
 # Changes in version 4.3-1.7.1 - 2017-11-17
diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java 
b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java
index 57d4165..23f11c7 100644
--- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java
+++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java
@@ -440,10 +440,12 @@ public class DocumentStore {
 long consensusWeight = -1L;
 long firstSeenMillis = -1L;
 String hostName = null;
+Boolean recommendedVersion = null;
 SummaryDocument summaryDocument = new SummaryDocument(isRelay,
 nickname, fingerprint, addresses, lastSeenMillis, running,
 relayFlags, consensusWeight, countryCode, firstSeenMillis,
-asNumber, contact, family, family, version, hostName);
+asNumber, contact, family, family, version, hostName,
+recommendedVersion);
 return summaryDocument;
   }
 
diff --git a/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java 
b/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java
index cca5ab9..11f6070 100644
--- a/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java
+++ b/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java
@@ -322,6 +322,18 @@ public class SummaryDocument extends Document {
 return this.hostName;
   }
 
+  @Expose
+  @SerializedName("rv")
+  private Boolean recommendedVersion;
+
+  public void setRecommendedVersion(Boolean recommendedVersion) {
+this.recommendedVersion = recommendedVersion;
+  }
+
+  public Boolean getRecommendedVersion() {
+return this.recommendedVersion;
+  }
+
   /* The familyFingerprints parameter can go away after September 8, 2015.
* See above. */
   /** Instantiates a summary document with all given properties. */
@@ -330,7 +342,8 @@ public class SummaryDocument extends Document {
   boolean running, SortedSet relayFlags, long consensusWeight,
   String countryCode, long firstSeenMillis, String asNumber,
   String contact, SortedSet familyFingerprints,
-  SortedSet effectiveFamily, String version, String hostName) {
+  SortedSet effectiveFamily, String version, String hostName,
+  Boolean recommendedVersion) {
 this.setRelay(isRelay);
 this.setNickname(nickname);
 this.setFingerprint(fingerprint);
@@ -347,6 +360,7 @@ public class SummaryDocument extends Document {
 this.setEffectiveFamily(effectiveFamily);
 this.setVersion(version);
 this.setHostName(hostName);
+this.setRecommendedVersion(recommendedVersion);
   }
 }
 
diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndex.java 
b/src/main/java/org/torproject/onionoo/server/NodeIndex.java
index c41dd7a..8ab22a4 100644
--- a/src/main/java/org/torproject/onionoo/server/NodeIndex.java
+++ b/src/main/java/org/torproject/onionoo/server/NodeIndex.java
@@ -199,5 +199,27 @@ class NodeIndex {
   public Map getRelaysByHostName() {
 return this.relaysByHostName;
   }
+
+  private Map relaysByRecommendedVersion;
+
+  public void setRelaysByRecommendedVersion(
+  Map relaysByRecommendedVersion) {
+this.relaysByRecommendedVersion = relaysByRecommendedVersion;
+  }
+
+  public Map getRelaysByRecommendedVersion() {
+return this.relaysByRecommendedVersion;