[tor-commits] [translation/tor-messenger-otrproperties_completed] Update translations for tor-messenger-otrproperties_completed

2017-12-11 Thread translation
commit 1f8fc5a525754eab6edfddcdecfb6d6f332c4bd8
Author: Translation commit bot 
Date:   Tue Dec 12 06:49:43 2017 +

Update translations for tor-messenger-otrproperties_completed
---
 ms_MY/otr.properties | 31 +++
 1 file changed, 31 insertions(+)

diff --git a/ms_MY/otr.properties b/ms_MY/otr.properties
new file mode 100644
index 0..6c78564ff
--- /dev/null
+++ b/ms_MY/otr.properties
@@ -0,0 +1,31 @@
+msgevent.encryption_required_part1=Anda cuba menghantar mesej tidak sulit 
kepada %S. Mengikut polisi, mesej tidak sulit tidak dibenarkan.
+msgevent.encryption_required_part2=Percubaan untuk memulakan perbualan 
persendirian. Mesej anda akan dihantar semula semasa perbualan persendirian 
bermula.
+msgevent.encryption_error=Satu ralat berlaku ketika menyulitkan mesej anda. 
Oleh itu mesej tidak dihantar.
+msgevent.connection_ended=%S sudah menutup sambungan persendirian mereka 
dengan anda. Mesej anda tidak dihantar. Sama ada anda tamatkan perbualan 
persendirian, atau mulakannya semula.
+msgevent.setup_error=Satu ralat berlaku ketika menetapkan perbualan 
persendirian dengan %S.
+msgevent.msg_reflected=Anda telah menerima mesej OTR anda sendiri. Sama ada 
anda berbual dengan diri sendiri, atau ada orang lain yang memantul balik mesej 
tersebut kembali kepada anda.
+msgevent.msg_resent=Mesej terakhir kepada %S telah dihantar semula.
+msgevent.rcvdmsg_not_private=Mesej tersulit yang diterima daripada %S tidak 
boleh dibaca, kerana anda tidak berkomunikasi denganya secara sulit.
+msgevent.rcvdmsg_unreadable=Kami telah menerima satu mesej tersulit yang tidak 
boleh dibaca daripada %S.
+msgevent.rcvdmsg_malformed=Kami telah menerima mesej dengan data cacat 
daripada %S.
+msgevent.log_heartbeat_rcvd=Heartbeat diterima daripada %S.
+msgevent.log_heartbeat_sent=Heartbeat dihantar kepada %S.
+msgevent.rcvdmsg_general_err=Satu ralat OTR telah berlaku.
+msgevent.rcvdmsg_unecrypted=Mesej berikut telah diterima dariapda %S tidak 
disulitkan: %S
+msgevent.rcvdmsg_unrecognized=Kami telah menerima satu mesej OTR yang tidak 
dikenalpasti daripada %S.
+msgevent.rcvdmsg_for_other_instance=%S telah menghantar satu mesej yang 
sepatutnya ke sesi lain. Jika anda mendaftar masuk lebih dari sekali, sesi yang 
lain mungki telah menerima mesej tersebut.
+context.gone_secure_private=Perbualan persendirian dengan %S telah bermula.
+context.gone_secure_unverified=Perbualan persendirian dengan %S telah bermula. 
Walaubagaimanapun, identiti beliau belum disahkan lagi.
+context.still_secure=Berjaya menyegar semula perbualan persendirian dengan %S.
+error.enc=Ralat berlaku ketika menyulitkan mesej.
+error.not_priv=Anda telah menghantar data tersulit kepada %S, yang mana beliau 
tidak menjangkakannya.
+error.unreadable=Anda telah menghantar satu mesej tersulit yang tidak boleh 
dibaca.
+error.malformed=Anda telah menghantar satu mesej data yang cacat.
+resent=[hantar semula]
+tlv.disconnected=%S telah menamatkan perbualan persendirian mereka dengan 
anda; anda patut lakukan perkara yang sama.
+query.msg=%S telah meminta perbualan persendirian Tanpa-Rekod. 
Walaubagaimanapun, anda tidak memasang pemalam yang menyokongnya. Sila rujuk 
http://otr.cypherpunks.ca/ untuk maklumat lanjut.
+trust.unused=Tidak Digunakan
+trust.not_private=Bukan Persendirian
+trust.unverified=Belum Disahkan
+trust.private=Persendirian
+trust.finished=Selesai

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


[tor-commits] [translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties

2017-12-11 Thread translation
commit 5ccf9fd9e11f0be023377f44b6d34514f538a06a
Author: Translation commit bot 
Date:   Tue Dec 12 06:49:38 2017 +

Update translations for tor-messenger-otrproperties
---
 ms_MY/otr.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ms_MY/otr.properties b/ms_MY/otr.properties
index 48358977e..6c78564ff 100644
--- a/ms_MY/otr.properties
+++ b/ms_MY/otr.properties
@@ -8,8 +8,8 @@ msgevent.msg_resent=Mesej terakhir kepada %S telah dihantar 
semula.
 msgevent.rcvdmsg_not_private=Mesej tersulit yang diterima daripada %S tidak 
boleh dibaca, kerana anda tidak berkomunikasi denganya secara sulit.
 msgevent.rcvdmsg_unreadable=Kami telah menerima satu mesej tersulit yang tidak 
boleh dibaca daripada %S.
 msgevent.rcvdmsg_malformed=Kami telah menerima mesej dengan data cacat 
daripada %S.
-msgevent.log_heartbeat_rcvd=Heartbeat received from %S.
-msgevent.log_heartbeat_sent=Heartbeat sent to %S.
+msgevent.log_heartbeat_rcvd=Heartbeat diterima daripada %S.
+msgevent.log_heartbeat_sent=Heartbeat dihantar kepada %S.
 msgevent.rcvdmsg_general_err=Satu ralat OTR telah berlaku.
 msgevent.rcvdmsg_unecrypted=Mesej berikut telah diterima dariapda %S tidak 
disulitkan: %S
 msgevent.rcvdmsg_unrecognized=Kami telah menerima satu mesej OTR yang tidak 
dikenalpasti daripada %S.
@@ -23,7 +23,7 @@ error.unreadable=Anda telah menghantar satu mesej tersulit 
yang tidak boleh diba
 error.malformed=Anda telah menghantar satu mesej data yang cacat.
 resent=[hantar semula]
 tlv.disconnected=%S telah menamatkan perbualan persendirian mereka dengan 
anda; anda patut lakukan perkara yang sama.
-query.msg=%S has requested an Off-the Record private conversation. However, 
you do not have a plugin to support that. See http://otr.cypherpunks.ca/ for 
more information.
+query.msg=%S telah meminta perbualan persendirian Tanpa-Rekod. 
Walaubagaimanapun, anda tidak memasang pemalam yang menyokongnya. Sila rujuk 
http://otr.cypherpunks.ca/ untuk maklumat lanjut.
 trust.unused=Tidak Digunakan
 trust.not_private=Bukan Persendirian
 trust.unverified=Belum Disahkan

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


[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2017-12-11 Thread translation
commit 6978286f065d74be6121ec7def74c8996c2947be
Author: Translation commit bot 
Date:   Tue Dec 12 06:47:39 2017 +

Update translations for torbutton-torbuttonproperties
---
 ms_MY/torbutton.properties | 36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/ms_MY/torbutton.properties b/ms_MY/torbutton.properties
index 6509d4901..0c941cb83 100644
--- a/ms_MY/torbutton.properties
+++ b/ms_MY/torbutton.properties
@@ -1,23 +1,23 @@
 torbutton.circuit_display.internet = Internet
-torbutton.circuit_display.ip_unknown = IP unknown
-torbutton.circuit_display.onion_site = Onion site
-torbutton.circuit_display.this_browser = This browser
-torbutton.circuit_display.relay = relay
-torbutton.circuit_display.tor_bridge = Bridge
-torbutton.circuit_display.unknown_country = Unknown country
+torbutton.circuit_display.ip_unknown = IP tidak diketahui
+torbutton.circuit_display.onion_site = Laman Onion
+torbutton.circuit_display.this_browser = Pelayar ini
+torbutton.circuit_display.relay = geganti
+torbutton.circuit_display.tor_bridge = Titi
+torbutton.circuit_display.unknown_country = Negara tidak diketahui
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make 
the width and height of your window less distinctive, and thus reduces the 
ability of people to track you online.
 torbutton.panel.tooltip.disabled = Klik untuk benarkan Tor
 torbutton.panel.tooltip.enabled = Klik untuk lumpuhkan Tor
 torbutton.panel.label.disabled = Tor Dilumpuhkan
 torbutton.panel.label.enabled = Tor Dibenarkan
 extensions.torbut...@torproject.org.description = Torbutton menyediakan butang 
bagi mengkonfigur tetapan Tor secara pantas dan mudah membersihkan data 
pelayaran persendirian anda.
-torbutton.popup.external.title = Download an external file type?
-torbutton.popup.external.app = Tor Browser cannot display this file. You will 
need to open it with another application.\n\n
-torbutton.popup.external.note = Some types of files can cause applications to 
connect to the Internet without using Tor.\n\n
-torbutton.popup.external.suggest = To be safe, you should only open downloaded 
files while offline, or use a Tor Live CD such as Tails.\n
-torbutton.popup.launch = Download file
+torbutton.popup.external.title = Muat turun jenis fail luar?
+torbutton.popup.external.app = Pelayar Tor tidak dapat paparkan fail ini. Anda 
perlu membukanya dengan aplikasi lain.\n\n
+torbutton.popup.external.note = Sesetengah jenis fail boleh menyebabkan 
aplikasi menyambung dengan Internet tanpa menggunakan Tor.\n\n
+torbutton.popup.external.suggest = Sebagai langkah berjaga-jaga, anda 
sepatutnya hanya membuka fail dimuat turun ketika berada diluar talian, atau 
guna CD Langsung Tor seperti Tails.\n
+torbutton.popup.launch = Muat turun fail
 torbutton.popup.cancel = Batal
-torbutton.popup.dontask = Automatically download files from now on
+torbutton.popup.dontask = Muat turun fail secara automatik mulai sekarang
 torbutton.popup.prompted_language = Untuk memberikan anda lebih privasi, 
Torbutton boleh meminta versi Bahasa Inggeris dari laman sesawang. Ia 
membolehkan laman sesawang yang menggunakan bahasa ibunda anda selain 
dipaparkan dalam Bahasa Inggeris.\n\nAnda ingin meminta halaman sesawang dalam 
bahasa Inggeris untuk privasi lebih baik?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. 
It does not have access to the Tor Control Port.\n\nAre you running Tor Browser 
Bundle?
 torbutton.title.prompt_torbrowser = Maklumat Torbutton Penting
@@ -28,23 +28,23 @@ torbutton.popup.confirm_plugins = Pemalam seperti Flash 
boleh mengganggu privasi
 torbutton.popup.never_ask_again = Jangan tanya saya lagi
 torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. 
All website sessions will be lost.\n\nRestart Tor Browser now to reset your 
identity?\n\n
 
-torbutton.slider_notification = The green onion menu now has a security slider 
which lets you adjust your security level. Check it out!
-torbutton.slider_notification_button = Open security settings
+torbutton.slider_notification = Menu bawang hijau kini mempunyai pelungsur 
keselamatan yang membolehkan anda laras tahap keselamatan anda. Lihatlah!
+torbutton.slider_notification_button = Buka tetapan keselamatan
 
 torbutton.maximize_warning = Maximizing Tor Browser can allow websites to 
determine your monitor size, which can be used to track you. We recommend that 
you leave Tor Browser windows in their original default size.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image 
data, which may be used to uniquely identify your computer.\n\nShould Tor 
Browser allow this website to extract HTML5 canvas image data?
-canvas.notNow=Not Now
+canvas.notNow=Bukan Sekarang
 canvas.notNowAccessKey=N
-canvas.allow=Allow in the future
+canvas.allow=Benarkan pada masa hadapan
 canvas.allowAccessKey

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2017-12-11 Thread translation
commit 169225349988f1135ab56a970a49c722771ac8ff
Author: Translation commit bot 
Date:   Tue Dec 12 06:47:47 2017 +

Update translations for torbutton-torbuttondtd
---
 ms_MY/torbutton.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ms_MY/torbutton.dtd b/ms_MY/torbutton.dtd
index 5d9f51631..2f566dc95 100644
--- a/ms_MY/torbutton.dtd
+++ b/ms_MY/torbutton.dtd
@@ -10,7 +10,7 @@
 
 
 
-
+
 
 
 

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


[tor-commits] [depictor/master] Add a NoIPv6Consensus flag to indicate when the authorities could not form a consensus about a relay's IPv6 address. Closes #24557

2017-12-11 Thread tom
commit 62a10c50ccb4956ebcd6c010ddf93139c0cc54b6
Author: Tom Ritter 
Date:   Mon Dec 11 15:03:44 2017 -0600

Add a NoIPv6Consensus flag to indicate when the authorities could not form 
a consensus about a relay's IPv6 address. Closes #24557
---
 website.py | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/website.py b/website.py
index c71e486..fc9cf91 100755
--- a/website.py
+++ b/website.py
@@ -86,6 +86,7 @@ class WebsiteWriter:
self.already_added_pseudoflags = True
 
# Add the ReachableIPv6 flag
+   routers_with_ipv6 = set()
for dirauth_nickname in self.known_authorities:
if dirauth_nickname in self.votes:
vote = self.votes[dirauth_nickname]
@@ -93,13 +94,18 @@ class WebsiteWriter:
for r in vote.routers:
if len([a for a in 
vote.routers[r].or_addresses if a[2] == True]):
has_ipv6 = True
+   routers_with_ipv6.add(r)

vote.routers[r].flags.append('ReachableIPv6')
if has_ipv6:
vote.known_flags.append('ReachableIPv6')
+   
vote.known_flags.append('NoIPv6Consensus')
for r in self.consensus.routers:
if len([a for a in 
self.consensus.routers[r].or_addresses if a[2] == True]):

self.consensus.routers[r].flags.append('ReachableIPv6')
+   elif r in routers_with_ipv6:
+   
self.consensus.routers[r].flags.append('NoIPv6Consensus')
self.consensus.known_flags.append('ReachableIPv6')
+   self.consensus.known_flags.append('NoIPv6Consensus')
 

#-
def _write_page_header(self, include_relay_info):

___
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] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread 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 'maint-0.3.0' into maint-0.3.1

2017-12-11 Thread nickm
commit 04524443d071f3e310067e0a7ecdc52a97e80107
Merge: 736e7299c 2ea573ece
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 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] Merge branch 'maint-0.3.1' into maint-0.3.2

2017-12-11 Thread nickm
commit 43fb8fc5cba65edbd882729580e0d67857ecf7fe
Merge: e553bf3ce 04524443d
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2




___
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.9' into maint-0.3.0

2017-12-11 Thread nickm
commit 2ea573ece8f168749b40eddcd023b71bf05a4fef
Merge: 7fcb222ab eaaa1108a
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

2017-12-11 Thread nickm
commit ee1bbe21ab74873b498b143728c17334cbd3ce5e
Merge: b63cbec65 04524443d
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 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] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d
Merge: 461e34bb3 8be50ca3e
Author: Nick Mathewson 
Date:   Mon Dec 11 16:53:02 2017 -0500

Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

 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] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49
Merge: f97f301b5 f5d4bdf30
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:11 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 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 bc7a2fcfc,e1c2d20b3..b134f2e31
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2310,9 -2063,8 +2310,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] Merge branch 'maint-0.3.2' into release-0.3.2

2017-12-11 Thread nickm
commit 2cfb7b0413d7f1e0b3c5004c8c2877c53b39244b
Merge: a14ff6b9c 43fb8fc5c
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

___
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 remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d
Merge: 461e34bb3 8be50ca3e
Author: Nick Mathewson 
Date:   Mon Dec 11 16:53:02 2017 -0500

Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

 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] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874
Merge: 7e486dd6f bc1ea4f47
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-11 Thread nickm
commit 2ea573ece8f168749b40eddcd023b71bf05a4fef
Merge: 7fcb222ab eaaa1108a
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 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.1] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-12-11 Thread nickm
commit 04524443d071f3e310067e0a7ecdc52a97e80107
Merge: 736e7299c 2ea573ece
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 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.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-11 Thread nickm
commit 2ea573ece8f168749b40eddcd023b71bf05a4fef
Merge: 7fcb222ab eaaa1108a
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 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.1] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49
Merge: f97f301b5 f5d4bdf30
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:11 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 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 bc7a2fcfc,e1c2d20b3..b134f2e31
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2310,9 -2063,8 +2310,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.0] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d
Merge: 461e34bb3 8be50ca3e
Author: Nick Mathewson 
Date:   Mon Dec 11 16:53:02 2017 -0500

Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

 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.2.9] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49
Merge: f97f301b5 f5d4bdf30
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:11 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 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 bc7a2fcfc,e1c2d20b3..b134f2e31
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2310,9 -2063,8 +2310,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.1] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874
Merge: 7e486dd6f bc1ea4f47
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2017-12-11 Thread nickm
commit 473725a63d92fc4ef3aabd18d25fd54d53439959
Merge: 3ccd1c0da eaaa1108a
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 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.0] Merge branch 'maint-0.3.0' into release-0.3.0

2017-12-11 Thread nickm
commit e11830b2b4d3f15fd73703b5f4a7c784d09456f7
Merge: ebf4f3f82 2ea573ece
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 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.0] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread 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.0] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49
Merge: f97f301b5 f5d4bdf30
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:11 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 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 bc7a2fcfc,e1c2d20b3..b134f2e31
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2310,9 -2063,8 +2310,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.0] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874
Merge: 7e486dd6f bc1ea4f47
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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 'maint-0.3.0' into maint-0.3.1

2017-12-11 Thread nickm
commit 04524443d071f3e310067e0a7ecdc52a97e80107
Merge: 736e7299c 2ea573ece
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 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.2.5] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d
Merge: 461e34bb3 8be50ca3e
Author: Nick Mathewson 
Date:   Mon Dec 11 16:53:02 2017 -0500

Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

 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.2.8] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread 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.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

2017-12-11 Thread nickm
commit ca19b2115a761ec37a6af56f6672cc0e16658929
Merge: 20ca62ffb f5d4bdf30
Author: Nick Mathewson 
Date:   Mon Dec 11 16:53:07 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 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/master] Merge branch 'maint-0.3.2'

2017-12-11 Thread nickm
commit 422ff8f922d2df7b90aba3e6e16c41100387b282
Merge: 16ec4da68 43fb8fc5c
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.3.2'

___
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 remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d
Merge: 461e34bb3 8be50ca3e
Author: Nick Mathewson 
Date:   Mon Dec 11 16:53:02 2017 -0500

Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

 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.2.8] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d
Merge: 461e34bb3 8be50ca3e
Author: Nick Mathewson 
Date:   Mon Dec 11 16:53:02 2017 -0500

Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

 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/master] Merge branch 'maint-0.3.1' into maint-0.3.2

2017-12-11 Thread nickm
commit 43fb8fc5cba65edbd882729580e0d67857ecf7fe
Merge: e553bf3ce 04524443d
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2




___
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

2017-12-11 Thread nickm
commit b077ccde4e890110ddfa9304d5badf261a2942b9
Merge: 3ec72ef52 bc1ea4f47
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:13 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 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.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874
Merge: 7e486dd6f bc1ea4f47
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.2.9] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread 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.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49
Merge: f97f301b5 f5d4bdf30
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:11 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 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 bc7a2fcfc,e1c2d20b3..b134f2e31
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2310,9 -2063,8 +2310,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.0' into maint-0.3.1

2017-12-11 Thread nickm
commit 04524443d071f3e310067e0a7ecdc52a97e80107
Merge: 736e7299c 2ea573ece
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 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/master] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49
Merge: f97f301b5 f5d4bdf30
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:11 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 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 bc7a2fcfc,e1c2d20b3..b134f2e31
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2310,9 -2063,8 +2310,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/maint-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49
Merge: f97f301b5 f5d4bdf30
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:11 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 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 bc7a2fcfc,e1c2d20b3..b134f2e31
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2310,9 -2063,8 +2310,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.2.5] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread 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.1] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874
Merge: 7e486dd6f bc1ea4f47
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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/master] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874
Merge: 7e486dd6f bc1ea4f47
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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 'maint-0.2.8' into maint-0.2.9

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874
Merge: 7e486dd6f bc1ea4f47
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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/master] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-11 Thread nickm
commit 2ea573ece8f168749b40eddcd023b71bf05a4fef
Merge: 7fcb222ab eaaa1108a
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 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.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-11 Thread nickm
commit 2ea573ece8f168749b40eddcd023b71bf05a4fef
Merge: 7fcb222ab eaaa1108a
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 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 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49
Merge: f97f301b5 f5d4bdf30
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:11 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 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 bc7a2fcfc,e1c2d20b3..b134f2e31
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2310,9 -2063,8 +2310,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 remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d
Merge: 461e34bb3 8be50ca3e
Author: Nick Mathewson 
Date:   Mon Dec 11 16:53:02 2017 -0500

Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

 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 'maint-0.2.9' into maint-0.3.0

2017-12-11 Thread nickm
commit 2ea573ece8f168749b40eddcd023b71bf05a4fef
Merge: 7fcb222ab eaaa1108a
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 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.1] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-12-11 Thread nickm
commit 04524443d071f3e310067e0a7ecdc52a97e80107
Merge: 736e7299c 2ea573ece
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 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 'maint-0.3.1' into maint-0.3.2

2017-12-11 Thread nickm
commit 43fb8fc5cba65edbd882729580e0d67857ecf7fe
Merge: e553bf3ce 04524443d
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

___
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

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874
Merge: 7e486dd6f bc1ea4f47
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.1] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread 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.0] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d
Merge: 461e34bb3 8be50ca3e
Author: Nick Mathewson 
Date:   Mon Dec 11 16:53:02 2017 -0500

Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

 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.1] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d
Merge: 461e34bb3 8be50ca3e
Author: Nick Mathewson 
Date:   Mon Dec 11 16:53:02 2017 -0500

Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

 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 remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d
Merge: 461e34bb3 8be50ca3e
Author: Nick Mathewson 
Date:   Mon Dec 11 16:53:02 2017 -0500

Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

 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.0] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread 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.2.5] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d
Merge: 461e34bb3 8be50ca3e
Author: Nick Mathewson 
Date:   Mon Dec 11 16:53:02 2017 -0500

Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

 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.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-11 Thread nickm
commit 2ea573ece8f168749b40eddcd023b71bf05a4fef
Merge: 7fcb222ab eaaa1108a
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 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.2.9] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d
Merge: 461e34bb3 8be50ca3e
Author: Nick Mathewson 
Date:   Mon Dec 11 16:53:02 2017 -0500

Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

 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.2.9] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49
Merge: f97f301b5 f5d4bdf30
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:11 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 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 bc7a2fcfc,e1c2d20b3..b134f2e31
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2310,9 -2063,8 +2310,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/maint-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49
Merge: f97f301b5 f5d4bdf30
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:11 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 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 bc7a2fcfc,e1c2d20b3..b134f2e31
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2310,9 -2063,8 +2310,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/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874
Merge: 7e486dd6f bc1ea4f47
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.2.5] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread 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.2.8] Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

2017-12-11 Thread nickm
commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d
Merge: 461e34bb3 8be50ca3e
Author: Nick Mathewson 
Date:   Mon Dec 11 16:53:02 2017 -0500

Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

 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.2.9] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread 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.2.8] relay: Change bandwidth stats interval to 24 hours

2017-12-11 Thread 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.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-11 Thread nickm
commit bc1ea4f470734f7fa22949318a98e286da5cba49
Merge: f97f301b5 f5d4bdf30
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:11 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 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 bc7a2fcfc,e1c2d20b3..b134f2e31
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2310,9 -2063,8 +2310,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.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-11 Thread nickm
commit 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9
Merge: c55a05423 7e486dd6f
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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

2017-12-11 Thread nickm
commit e553bf3ce4b68a752f5f75c9f2e78cfc45c68f2a
Merge: bfc9be4c7 736e7299c
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2




___
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

2017-12-11 Thread nickm
commit 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9
Merge: c55a05423 7e486dd6f
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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 remote-tracking branch 'public/bug23985_029' into maint-0.2.9

2017-12-11 Thread nickm
commit 7e486dd6f7f845c14471b406d6bc7dfa4f593b12
Merge: 953a8f851 0dc55fb24
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:54 2017 -0500

Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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

2017-12-11 Thread nickm
commit ebf4f3f823f5d5861ec9114ae8afa03c58074380
Merge: 87de19eff 7fcb222ab
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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

2017-12-11 Thread nickm
commit 736e7299ce04bd96aa75c50f7dd7ecba36945917
Merge: f7b41bcdf 7fcb222ab
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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.9' into maint-0.3.0

2017-12-11 Thread nickm
commit 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9
Merge: c55a05423 7e486dd6f
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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

2017-12-11 Thread nickm
commit a14ff6b9c71ee4891b9c992821a63d2df09fcd38
Merge: d77e82769 e553bf3ce
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

___
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] Don't delay descriptor fetches when missing info needed for circuits

2017-12-11 Thread nickm
commit 0dc55fb24756c5ae80e71f6fce93d97d73efd2fc
Author: Nick Mathewson 
Date:   Wed Nov 8 13:22:16 2017 -0500

Don't delay descriptor fetches when missing info needed for circuits

When we have fewer than 15 descriptors to fetch, we will delay the
fetch for a little while.  That's fine, if we can go ahead and build
circuits... but if not, it's a poor choice indeed.

Fixes bug 23985; bugfix on 0.1.1.11-alpha.

In 0.3.0.3-alpha, when we made primary guard descriptors necessary
for circuit building, this situation got worse.
---
 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 insertions(+)

diff --git a/changes/bug23985 b/changes/bug23985
new file mode 100644
index 0..9cb593796
--- /dev/null
+++ b/changes/bug23985
@@ -0,0 +1,9 @@
+  o Minor bugfixes (bootstrapping):
+- Fetch descriptors aggressively whenever we lack enough
+  to build circuits, regardless of how many descriptors we are missing.
+  Previously, we would delay launching the fetch when we had fewer than
+  15 missing descriptors, even if some of those descriptors were
+  blocking circuits from building. Fixes bug 23985; bugfix on
+  0.1.1.11-alpha. The effects of this bug became worse in 0.3.0.3-alpha,
+  when we began treating missing descriptors from our primary guards
+  as a reason to delay circuits.
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 2365f28fd..1b7c81ad5 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -5035,6 +5035,11 @@ launch_descriptor_downloads(int purpose,
   log_debug(LD_DIR,
 "There are enough downloadable %ss to launch requests.",
 descname);
+} else if (! router_have_minimum_dir_info()) {
+  log_debug(LD_DIR,
+"We are only missing %d %ss, but we'll fetch anyway, since "
+"we don't yet have enough directory info.",
+n_downloadable, descname);
 } else {
 
   /* should delay */



___
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

2017-12-11 Thread nickm
commit b63cbec65e33602af5ba3e310b87fddb4ad75ab5
Merge: 74ce41d4d 736e7299c
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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.0' into maint-0.3.1

2017-12-11 Thread nickm
commit 736e7299ce04bd96aa75c50f7dd7ecba36945917
Merge: f7b41bcdf 7fcb222ab
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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.1' into maint-0.3.2

2017-12-11 Thread nickm
commit e553bf3ce4b68a752f5f75c9f2e78cfc45c68f2a
Merge: bfc9be4c7 736e7299c
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

___
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

2017-12-11 Thread nickm
commit 3ccd1c0da7de19e0c61edf0180955b50588b8524
Merge: 6abdc77c3 7e486dd6f
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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.9' into maint-0.3.0

2017-12-11 Thread nickm
commit 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9
Merge: c55a05423 7e486dd6f
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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.9' into maint-0.3.0

2017-12-11 Thread nickm
commit 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9
Merge: c55a05423 7e486dd6f
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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.1' into maint-0.3.2

2017-12-11 Thread nickm
commit e553bf3ce4b68a752f5f75c9f2e78cfc45c68f2a
Merge: bfc9be4c7 736e7299c
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2




___
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

2017-12-11 Thread nickm
commit 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9
Merge: c55a05423 7e486dd6f
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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 remote-tracking branch 'public/bug23985_029' into maint-0.2.9

2017-12-11 Thread nickm
commit 7e486dd6f7f845c14471b406d6bc7dfa4f593b12
Merge: 953a8f851 0dc55fb24
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:54 2017 -0500

Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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 remote-tracking branch 'public/bug23985_029' into maint-0.2.9

2017-12-11 Thread nickm
commit 7e486dd6f7f845c14471b406d6bc7dfa4f593b12
Merge: 953a8f851 0dc55fb24
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:54 2017 -0500

Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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 remote-tracking branch 'public/bug23985_029' into maint-0.2.9

2017-12-11 Thread nickm
commit 7e486dd6f7f845c14471b406d6bc7dfa4f593b12
Merge: 953a8f851 0dc55fb24
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:54 2017 -0500

Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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 remote-tracking branch 'public/bug23985_029' into maint-0.2.9

2017-12-11 Thread nickm
commit 7e486dd6f7f845c14471b406d6bc7dfa4f593b12
Merge: 953a8f851 0dc55fb24
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:54 2017 -0500

Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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] Don't delay descriptor fetches when missing info needed for circuits

2017-12-11 Thread nickm
commit 0dc55fb24756c5ae80e71f6fce93d97d73efd2fc
Author: Nick Mathewson 
Date:   Wed Nov 8 13:22:16 2017 -0500

Don't delay descriptor fetches when missing info needed for circuits

When we have fewer than 15 descriptors to fetch, we will delay the
fetch for a little while.  That's fine, if we can go ahead and build
circuits... but if not, it's a poor choice indeed.

Fixes bug 23985; bugfix on 0.1.1.11-alpha.

In 0.3.0.3-alpha, when we made primary guard descriptors necessary
for circuit building, this situation got worse.
---
 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 insertions(+)

diff --git a/changes/bug23985 b/changes/bug23985
new file mode 100644
index 0..9cb593796
--- /dev/null
+++ b/changes/bug23985
@@ -0,0 +1,9 @@
+  o Minor bugfixes (bootstrapping):
+- Fetch descriptors aggressively whenever we lack enough
+  to build circuits, regardless of how many descriptors we are missing.
+  Previously, we would delay launching the fetch when we had fewer than
+  15 missing descriptors, even if some of those descriptors were
+  blocking circuits from building. Fixes bug 23985; bugfix on
+  0.1.1.11-alpha. The effects of this bug became worse in 0.3.0.3-alpha,
+  when we began treating missing descriptors from our primary guards
+  as a reason to delay circuits.
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 2365f28fd..1b7c81ad5 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -5035,6 +5035,11 @@ launch_descriptor_downloads(int purpose,
   log_debug(LD_DIR,
 "There are enough downloadable %ss to launch requests.",
 descname);
+} else if (! router_have_minimum_dir_info()) {
+  log_debug(LD_DIR,
+"We are only missing %d %ss, but we'll fetch anyway, since "
+"we don't yet have enough directory info.",
+n_downloadable, descname);
 } else {
 
   /* should delay */



___
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'

2017-12-11 Thread nickm
commit 16ec4da68c1e683d713b29f0408f504dbe635116
Merge: abcc7032c e553bf3ce
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.3.2'

___
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

2017-12-11 Thread nickm
commit 736e7299ce04bd96aa75c50f7dd7ecba36945917
Merge: f7b41bcdf 7fcb222ab
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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] Don't delay descriptor fetches when missing info needed for circuits

2017-12-11 Thread nickm
commit 0dc55fb24756c5ae80e71f6fce93d97d73efd2fc
Author: Nick Mathewson 
Date:   Wed Nov 8 13:22:16 2017 -0500

Don't delay descriptor fetches when missing info needed for circuits

When we have fewer than 15 descriptors to fetch, we will delay the
fetch for a little while.  That's fine, if we can go ahead and build
circuits... but if not, it's a poor choice indeed.

Fixes bug 23985; bugfix on 0.1.1.11-alpha.

In 0.3.0.3-alpha, when we made primary guard descriptors necessary
for circuit building, this situation got worse.
---
 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 insertions(+)

diff --git a/changes/bug23985 b/changes/bug23985
new file mode 100644
index 0..9cb593796
--- /dev/null
+++ b/changes/bug23985
@@ -0,0 +1,9 @@
+  o Minor bugfixes (bootstrapping):
+- Fetch descriptors aggressively whenever we lack enough
+  to build circuits, regardless of how many descriptors we are missing.
+  Previously, we would delay launching the fetch when we had fewer than
+  15 missing descriptors, even if some of those descriptors were
+  blocking circuits from building. Fixes bug 23985; bugfix on
+  0.1.1.11-alpha. The effects of this bug became worse in 0.3.0.3-alpha,
+  when we began treating missing descriptors from our primary guards
+  as a reason to delay circuits.
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 2365f28fd..1b7c81ad5 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -5035,6 +5035,11 @@ launch_descriptor_downloads(int purpose,
   log_debug(LD_DIR,
 "There are enough downloadable %ss to launch requests.",
 descname);
+} else if (! router_have_minimum_dir_info()) {
+  log_debug(LD_DIR,
+"We are only missing %d %ss, but we'll fetch anyway, since "
+"we don't yet have enough directory info.",
+n_downloadable, descname);
 } else {
 
   /* should delay */



___
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

2017-12-11 Thread nickm
commit 736e7299ce04bd96aa75c50f7dd7ecba36945917
Merge: f7b41bcdf 7fcb222ab
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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 remote-tracking branch 'public/bug23985_029' into maint-0.2.9

2017-12-11 Thread nickm
commit 7e486dd6f7f845c14471b406d6bc7dfa4f593b12
Merge: 953a8f851 0dc55fb24
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:54 2017 -0500

Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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] Don't delay descriptor fetches when missing info needed for circuits

2017-12-11 Thread nickm
commit 0dc55fb24756c5ae80e71f6fce93d97d73efd2fc
Author: Nick Mathewson 
Date:   Wed Nov 8 13:22:16 2017 -0500

Don't delay descriptor fetches when missing info needed for circuits

When we have fewer than 15 descriptors to fetch, we will delay the
fetch for a little while.  That's fine, if we can go ahead and build
circuits... but if not, it's a poor choice indeed.

Fixes bug 23985; bugfix on 0.1.1.11-alpha.

In 0.3.0.3-alpha, when we made primary guard descriptors necessary
for circuit building, this situation got worse.
---
 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 insertions(+)

diff --git a/changes/bug23985 b/changes/bug23985
new file mode 100644
index 0..9cb593796
--- /dev/null
+++ b/changes/bug23985
@@ -0,0 +1,9 @@
+  o Minor bugfixes (bootstrapping):
+- Fetch descriptors aggressively whenever we lack enough
+  to build circuits, regardless of how many descriptors we are missing.
+  Previously, we would delay launching the fetch when we had fewer than
+  15 missing descriptors, even if some of those descriptors were
+  blocking circuits from building. Fixes bug 23985; bugfix on
+  0.1.1.11-alpha. The effects of this bug became worse in 0.3.0.3-alpha,
+  when we began treating missing descriptors from our primary guards
+  as a reason to delay circuits.
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 2365f28fd..1b7c81ad5 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -5035,6 +5035,11 @@ launch_descriptor_downloads(int purpose,
   log_debug(LD_DIR,
 "There are enough downloadable %ss to launch requests.",
 descname);
+} else if (! router_have_minimum_dir_info()) {
+  log_debug(LD_DIR,
+"We are only missing %d %ss, but we'll fetch anyway, since "
+"we don't yet have enough directory info.",
+n_downloadable, descname);
 } else {
 
   /* should delay */



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


[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9

2017-12-11 Thread nickm
commit 7e486dd6f7f845c14471b406d6bc7dfa4f593b12
Merge: 953a8f851 0dc55fb24
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:54 2017 -0500

Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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] Don't delay descriptor fetches when missing info needed for circuits

2017-12-11 Thread nickm
commit 0dc55fb24756c5ae80e71f6fce93d97d73efd2fc
Author: Nick Mathewson 
Date:   Wed Nov 8 13:22:16 2017 -0500

Don't delay descriptor fetches when missing info needed for circuits

When we have fewer than 15 descriptors to fetch, we will delay the
fetch for a little while.  That's fine, if we can go ahead and build
circuits... but if not, it's a poor choice indeed.

Fixes bug 23985; bugfix on 0.1.1.11-alpha.

In 0.3.0.3-alpha, when we made primary guard descriptors necessary
for circuit building, this situation got worse.
---
 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 insertions(+)

diff --git a/changes/bug23985 b/changes/bug23985
new file mode 100644
index 0..9cb593796
--- /dev/null
+++ b/changes/bug23985
@@ -0,0 +1,9 @@
+  o Minor bugfixes (bootstrapping):
+- Fetch descriptors aggressively whenever we lack enough
+  to build circuits, regardless of how many descriptors we are missing.
+  Previously, we would delay launching the fetch when we had fewer than
+  15 missing descriptors, even if some of those descriptors were
+  blocking circuits from building. Fixes bug 23985; bugfix on
+  0.1.1.11-alpha. The effects of this bug became worse in 0.3.0.3-alpha,
+  when we began treating missing descriptors from our primary guards
+  as a reason to delay circuits.
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 2365f28fd..1b7c81ad5 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -5035,6 +5035,11 @@ launch_descriptor_downloads(int purpose,
   log_debug(LD_DIR,
 "There are enough downloadable %ss to launch requests.",
 descname);
+} else if (! router_have_minimum_dir_info()) {
+  log_debug(LD_DIR,
+"We are only missing %d %ss, but we'll fetch anyway, since "
+"we don't yet have enough directory info.",
+n_downloadable, descname);
 } else {
 
   /* should delay */



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


  1   2   3   >