[tor-commits] [tor/maint-0.2.8] Fix unused-but-set-variable warnings in the connection unit tests

2016-05-19 Thread nickm
commit 2d21f03cdcf759e434b5f82abe9bd285c37004ff Author: teor (Tim Wilson-Brown) Date: Thu May 19 12:49:36 2016 -0400 Fix unused-but-set-variable warnings in the connection unit tests No behaviour change - just remove the variables ---

[tor-commits] [tor/master] Fix unused-but-set-variable warnings in the connection unit tests

2016-05-19 Thread nickm
commit 2d21f03cdcf759e434b5f82abe9bd285c37004ff Author: teor (Tim Wilson-Brown) Date: Thu May 19 12:49:36 2016 -0400 Fix unused-but-set-variable warnings in the connection unit tests No behaviour change - just remove the variables ---

[tor-commits] [tor/release-0.2.8] Describe what happens when we get a consensus, but no certificates

2016-05-19 Thread nickm
commit c5d87ef6af78ec24bebac1c634dd8d16dda585f8 Author: teor (Tim Wilson-Brown) Date: Thu May 19 12:35:09 2016 -0400 Describe what happens when we get a consensus, but no certificates Comment-only change --- src/or/networkstatus.c | 6 +- 1 file changed, 5

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

2016-05-19 Thread nickm
commit f2824887e326e9fdc5f096f99d4dfe4aeee4d79a Merge: 945aa99 33841a6 Author: Nick Mathewson Date: Thu May 19 16:05:04 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 src/or/networkstatus.c | 6 +- src/test/test_connection.c | 20

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/fix18809-warnings' into maint-0.2.8

2016-05-19 Thread nickm
commit 33841a60303ce8febf8180829a868dcc43924d77 Merge: 0d6f293 2d21f03 Author: Nick Mathewson Date: Thu May 19 16:04:56 2016 -0400 Merge remote-tracking branch 'teor/fix18809-warnings' into maint-0.2.8 src/or/networkstatus.c | 6 +-

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

2016-05-19 Thread nickm
commit dcc4fd440392eec3dd8796c9c759faed51a61db0 Merge: 649785d 33841a6 Author: Nick Mathewson Date: Thu May 19 16:05:13 2016 -0400 Merge branch 'maint-0.2.8' src/or/networkstatus.c | 6 +- src/test/test_connection.c | 20 +--- 2 files

[tor-commits] [tor/master] Describe what happens when we get a consensus, but no certificates

2016-05-19 Thread nickm
commit c5d87ef6af78ec24bebac1c634dd8d16dda585f8 Author: teor (Tim Wilson-Brown) Date: Thu May 19 12:35:09 2016 -0400 Describe what happens when we get a consensus, but no certificates Comment-only change --- src/or/networkstatus.c | 6 +- 1 file changed, 5

[tor-commits] [tor/maint-0.2.8] Describe what happens when we get a consensus, but no certificates

2016-05-19 Thread nickm
commit c5d87ef6af78ec24bebac1c634dd8d16dda585f8 Author: teor (Tim Wilson-Brown) Date: Thu May 19 12:35:09 2016 -0400 Describe what happens when we get a consensus, but no certificates Comment-only change --- src/or/networkstatus.c | 6 +- 1 file changed, 5

[tor-commits] [tor/master] Include __mulodi4 in libor_ctime when it fixes clang -m32 -ftrapv

2016-05-19 Thread nickm
commit 6d6c8287d5e060117bfa066f87d4e2fc08ab708d Author: Nick Mathewson Date: Wed May 18 09:44:05 2016 -0400 Include __mulodi4 in libor_ctime when it fixes clang -m32 -ftrapv We use a pretty specific pair of autoconf tests here to make sure that we only

[tor-commits] [tor/master] Merge branch 'link_ftrapv_clang32'

2016-05-19 Thread nickm
commit 649785d464371f295405ced647b7b10f59053330 Merge: 4a14c2c ae7e2b9 Author: Nick Mathewson Date: Thu May 19 16:01:35 2016 -0400 Merge branch 'link_ftrapv_clang32' LICENSE| 104 + changes/bug19079

[tor-commits] [tor/master] add missing atoi for cosmetic reasons

2016-05-19 Thread nickm
commit ae7e2b9a7cd95ad04d3d416fd58cc20f8c4f06bd Author: Nick Mathewson Date: Thu May 19 16:01:25 2016 -0400 add missing atoi for cosmetic reasons --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac

[tor-commits] [tor/master] Add __mulodi4 source to src/ext

2016-05-19 Thread nickm
commit 33034600c250068cb1c413ddf9dba894f8ca6182 Author: Nick Mathewson Date: Wed May 18 09:41:07 2016 -0400 Add __mulodi4 source to src/ext We need to define this function when compiling with clang -m32 -ftrapv, since otherwise we get link errors, since

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

2016-05-19 Thread nickm
commit 4a14c2cfc7972db39da4fd3a72cfd64d036daf7b Merge: a7a44f2 0d6f293 Author: Nick Mathewson Date: Thu May 19 15:56:39 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18809 | 8 --- src/or/dirserv.c | 17 +++--- src/or/dirvote.c

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

2016-05-19 Thread nickm
commit 945aa9931112c02f5e50594915509b471897684c Merge: 2b8ba55 0d6f293 Author: Nick Mathewson Date: Thu May 19 15:56:45 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 src/or/dirserv.c | 17 +++--- src/or/dirvote.c | 7 +++---

[tor-commits] [tor/master] lintchanges on 18809, and fix the bug number

2016-05-19 Thread nickm
commit dd17df2253fb0592ed3f75f8cf5134b71800df62 Author: Nick Mathewson Date: Thu May 19 08:54:19 2016 -0400 lintchanges on 18809, and fix the bug number --- changes/bug18809 | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/changes/bug18809

[tor-commits] [tor/release-0.2.8] Remove duplicate siging_key_cert fields.

2016-05-19 Thread nickm
commit ab932cd7bfb7e4cfe9c33416ca45e56448c57b58 Author: Nick Mathewson Date: Tue May 17 20:04:16 2016 -0400 Remove duplicate siging_key_cert fields. With the fix for #17150, I added a duplicate certificate here. Here I remove the original location in

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug19073' into maint-0.2.8

2016-05-19 Thread nickm
commit 0d6f293e0e5ca7ae57347d8879a6ba7805a2cac3 Merge: dd17df2 2729f16 Author: Nick Mathewson Date: Thu May 19 15:56:31 2016 -0400 Merge remote-tracking branch 'public/bug19073' into maint-0.2.8 src/or/dirserv.c | 17 +++--- src/or/dirvote.c

[tor-commits] [tor/master] Remove duplicate siging_key_cert fields.

2016-05-19 Thread nickm
commit ab932cd7bfb7e4cfe9c33416ca45e56448c57b58 Author: Nick Mathewson Date: Tue May 17 20:04:16 2016 -0400 Remove duplicate siging_key_cert fields. With the fix for #17150, I added a duplicate certificate here. Here I remove the original location in

[tor-commits] [tor/release-0.2.8] whitespace fixes

2016-05-19 Thread nickm
commit 2729f166cb715f0f4aff8779f0fadebafc56a70c Author: Nick Mathewson Date: Tue May 17 20:08:03 2016 -0400 whitespace fixes --- src/or/dirserv.c | 5 +++-- src/or/router.c | 15 --- src/or/routerlist.c | 3 ++- src/or/routerparse.c | 7

[tor-commits] [tor/maint-0.2.8] whitespace fixes

2016-05-19 Thread nickm
commit 2729f166cb715f0f4aff8779f0fadebafc56a70c Author: Nick Mathewson Date: Tue May 17 20:08:03 2016 -0400 whitespace fixes --- src/or/dirserv.c | 5 +++-- src/or/router.c | 15 --- src/or/routerlist.c | 3 ++- src/or/routerparse.c | 7

[tor-commits] [tor/master] whitespace fixes

2016-05-19 Thread nickm
commit 2729f166cb715f0f4aff8779f0fadebafc56a70c Author: Nick Mathewson Date: Tue May 17 20:08:03 2016 -0400 whitespace fixes --- src/or/dirserv.c | 5 +++-- src/or/router.c | 15 --- src/or/routerlist.c | 3 ++- src/or/routerparse.c | 7

[tor-commits] [tor/maint-0.2.8] Merge remote-tracking branch 'public/bug19073' into maint-0.2.8

2016-05-19 Thread nickm
commit 0d6f293e0e5ca7ae57347d8879a6ba7805a2cac3 Merge: dd17df2 2729f16 Author: Nick Mathewson Date: Thu May 19 15:56:31 2016 -0400 Merge remote-tracking branch 'public/bug19073' into maint-0.2.8 src/or/dirserv.c | 17 +++--- src/or/dirvote.c

[tor-commits] [tor/maint-0.2.8] Remove duplicate siging_key_cert fields.

2016-05-19 Thread nickm
commit ab932cd7bfb7e4cfe9c33416ca45e56448c57b58 Author: Nick Mathewson Date: Tue May 17 20:04:16 2016 -0400 Remove duplicate siging_key_cert fields. With the fix for #17150, I added a duplicate certificate here. Here I remove the original location in

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

2016-05-19 Thread translation
commit dd16e22e9baa4a90e11ecfe94d42f0f466cb4392 Author: Translation commit bot Date: Thu May 19 19:15:43 2016 + Update translations for tails-misc --- it.po | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/it.po b/it.po index

[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

2016-05-19 Thread translation
commit 17a0b46809b41d3103972f3e6685ade3054a5ff5 Author: Translation commit bot Date: Thu May 19 18:16:33 2016 + Update translations for tor-and-https --- ca.po | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ca.po b/ca.po index

[tor-commits] [translation/tor-and-https_completed] Update translations for tor-and-https_completed

2016-05-19 Thread translation
commit cc156c2bf4f09462aa716f6dcc7f7bc37bad265b Author: Translation commit bot Date: Thu May 19 18:16:37 2016 + Update translations for tor-and-https_completed --- ca.po | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ca.po

[tor-commits] [translation/torbirdy_completed] Update translations for torbirdy_completed

2016-05-19 Thread translation
commit f4ea520d16513ff0a57ba0a1d01bb8beba0db9ea Author: Translation commit bot Date: Thu May 19 18:15:49 2016 + Update translations for torbirdy_completed --- ca/torbirdy.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/ca/torbirdy.properties

[tor-commits] [translation/torbirdy] Update translations for torbirdy

2016-05-19 Thread translation
commit 9c4cb0961fb353d59b176d4ec634f203e56700f8 Author: Translation commit bot Date: Thu May 19 18:15:45 2016 + Update translations for torbirdy --- ca/torbirdy.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2016-05-19 Thread translation
commit bf10737ed759b216e97ef0495fc6f4235ca498af Author: Translation commit bot Date: Thu May 19 18:15:29 2016 + Update translations for https_everywhere_completed --- ca/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

2016-05-19 Thread translation
commit ed8f47fc680cacbfae47331dd5d410882c21a50d Author: Translation commit bot Date: Thu May 19 18:16:00 2016 + Update translations for tor-launcher-properties_completed --- ca/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2016-05-19 Thread translation
commit c50ce3b2d07aaedb0f3635fa6ac65c9791efaeb7 Author: Translation commit bot Date: Thu May 19 18:15:56 2016 + Update translations for tor-launcher-properties --- ca/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2016-05-19 Thread translation
commit df669b467f8d04a67b072039c6515da62511fa35 Author: Translation commit bot Date: Thu May 19 18:15:23 2016 + Update translations for https_everywhere --- ca/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor-messenger-build/master] Bump tags to THUNDERBIRD_45_1_0_RELEASE

2016-05-19 Thread arlo
commit 049e3cfa0d3dcd103a810a613c30c02f36d21915 Author: Arlo Breault Date: Thu May 19 09:32:13 2016 -0700 Bump tags to THUNDERBIRD_45_1_0_RELEASE --- ChangeLog | 4 ++-- projects/instantbird/config | 2 +- projects/mozilla/config | 2 +- 3 files

[tor-commits] [translation/torbirdy_completed] Update translations for torbirdy_completed

2016-05-19 Thread translation
commit 393dc331fbc95dbee69504f5b24c319fec3d5939 Author: Translation commit bot Date: Thu May 19 13:15:32 2016 + Update translations for torbirdy_completed --- fa/torbirdy.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/fa/torbirdy.properties

[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

2016-05-19 Thread translation
commit 638b2877bada173db07738143a5159611b00137e Author: Translation commit bot Date: Thu May 19 13:15:42 2016 + Update translations for tor-launcher-properties_completed --- fa/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git

[tor-commits] [translation/torbirdy] Update translations for torbirdy

2016-05-19 Thread translation
commit 35d235430f9901fe0d2121d9ffc24ef17bca2bf2 Author: Translation commit bot Date: Thu May 19 13:15:28 2016 + Update translations for torbirdy --- fa/torbirdy.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2016-05-19 Thread translation
commit 88d1a4033d0a5c84d888c4d391c5a03467c1f3c6 Author: Translation commit bot Date: Thu May 19 13:15:38 2016 + Update translations for tor-launcher-properties --- fa/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/maint-0.2.8] lintchanges on 18809, and fix the bug number

2016-05-19 Thread nickm
commit dd17df2253fb0592ed3f75f8cf5134b71800df62 Author: Nick Mathewson Date: Thu May 19 08:54:19 2016 -0400 lintchanges on 18809, and fix the bug number --- changes/bug18809 | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/changes/bug18809

[tor-commits] [tor/release-0.2.8] Fold new changelog items in

2016-05-19 Thread nickm
commit 2b8ba551d3eab2793214ab34a1c9a47a888402cd Author: Nick Mathewson Date: Thu May 19 08:56:06 2016 -0400 Fold new changelog items in --- ChangeLog| 26 -- changes/bug17150 | 7 --- changes/bug18809 | 16 3

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

2016-05-19 Thread nickm
commit 0a05afa96dde84b010c87546ba49a801df92ab40 Merge: c4b7b4a dd17df2 Author: Nick Mathewson Date: Thu May 19 08:54:30 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug18809 | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-)

[tor-commits] [tor/release-0.2.8] lintchanges on 18809, and fix the bug number

2016-05-19 Thread nickm
commit dd17df2253fb0592ed3f75f8cf5134b71800df62 Author: Nick Mathewson Date: Thu May 19 08:54:19 2016 -0400 lintchanges on 18809, and fix the bug number --- changes/bug18809 | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/changes/bug18809

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

2016-05-19 Thread nickm
commit 1e97b6afc62388a6835d92c6fc9543cfa8caf964 Merge: ef03dc0 9f217c8 Author: Nick Mathewson Date: Thu May 19 08:17:11 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug17150 | 7 + changes/bug18809 | 14 ++

[tor-commits] [tor/release-0.2.8] Restore and improve download schedule unit tests

2016-05-19 Thread nickm
commit d5c70d71027644efb31d16d17b46d43484b46b18 Author: teor (Tim Wilson-Brown) Date: Wed May 18 21:31:03 2016 -0400 Restore and improve download schedule unit tests --- src/or/networkstatus.c | 8 +-- src/or/networkstatus.h | 6 +- src/test/test_dir.c| 153

[tor-commits] [tor/release-0.2.8] Add unit tests for networkstatus_consensus_is_bootstrapping

2016-05-19 Thread nickm
commit f698b509d8efdc055cfc05c6feaf0aecee41b9d0 Author: teor (Tim Wilson-Brown) Date: Wed May 18 22:05:35 2016 -0400 Add unit tests for networkstatus_consensus_is_bootstrapping --- src/or/microdesc.c | 4 ++-- src/or/microdesc.h | 2 +-

[tor-commits] [tor/release-0.2.8] changelog typo fix

2016-05-19 Thread nickm
commit 7c7d990704219ff1033dc9dc257378757ad7cecf Author: Nick Mathewson Date: Thu May 19 08:29:45 2016 -0400 changelog typo fix --- changes/bug18809 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug18809 b/changes/bug18809 index

[tor-commits] [tor/release-0.2.8] Stop downloading consensuses when a consensus has been downloaded

2016-05-19 Thread nickm
commit 84ab26c320151bde1fc52906266126aa8d7780a3 Author: teor (Tim Wilson-Brown) Date: Wed May 18 17:50:46 2016 -0400 Stop downloading consensuses when a consensus has been downloaded Previosuly, during bootstrap, we would continue to download consensuses if

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

2016-05-19 Thread nickm
commit 9f217c83b0d91508af0d63f04216fa78cdbfbe1b Merge: 3f49474 f698b50 Author: Nick Mathewson Date: Thu May 19 08:17:02 2016 -0400 Merge branch 'bug18809_028_squashed' into maint-0.2.8 changes/bug18809 | 14 ++ src/or/circuituse.c| 19 +++

[tor-commits] [tor/release-0.2.8] Fix a compilation error in test_dir.c

2016-05-19 Thread nickm
commit 06803c317f3865b2a365c4485618828f60bd5de9 Author: Nick Mathewson Date: Thu May 19 08:27:11 2016 -0400 Fix a compilation error in test_dir.c --- src/test/test_dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_dir.c

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

2016-05-19 Thread nickm
commit c4b7b4ad4ba35b724fa90012adafd62e48ed7e42 Merge: 1e97b6a 7c7d990 Author: Nick Mathewson Date: Thu May 19 08:29:52 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug18809| 2 +- src/test/test_dir.c | 2 +- 2 files changed, 2 insertions(+),

[tor-commits] [tor/release-0.2.8] close other consensus fetches when we get a consensus

2016-05-19 Thread nickm
commit a7665df2f8607403e5e14bf1af7426cedfea01dc Author: Roger Dingledine Date: Wed Apr 13 02:54:31 2016 -0400 close other consensus fetches when we get a consensus not once per second, and only do it when a consensus arrives --- src/or/directory.c | 123

[tor-commits] [tor/release-0.2.8] get rid of another no-longer-used function

2016-05-19 Thread nickm
commit 53aaed81dd34f227366b0a0c9b143c4c43a5529e Author: Roger Dingledine Date: Tue May 10 11:16:30 2016 -0400 get rid of another no-longer-used function --- src/or/networkstatus.c | 34 -- src/or/networkstatus.h | 1 - 2 files changed,

[tor-commits] [tor/release-0.2.8] Improve API of routerinfo_incompatible_with_extrainfo()

2016-05-19 Thread nickm
commit 00f74e0372a956f9db590e1cb2ddcfb265125023 Author: Nick Mathewson Date: Tue May 17 13:24:01 2016 -0400 Improve API of routerinfo_incompatible_with_extrainfo() This API change makes it so that routerinfo_incompatible...() no longer takes a

[tor-commits] [tor/release-0.2.8] Update unit tests for multiple bootstrap connections

2016-05-19 Thread nickm
commit 4254d0297c53155d582a51976b8e5bb41abfced6 Author: teor (Tim Wilson-Brown) Date: Wed May 18 20:21:31 2016 -0400 Update unit tests for multiple bootstrap connections --- src/test/test_connection.c | 405 - 1 file changed,

[tor-commits] [tor/release-0.2.8] Fix documentation for routerinfo_incompatible_with_extrainfo

2016-05-19 Thread nickm
commit 64748f2f987a28815f056dfe3a8a739f46d9157f Author: Nick Mathewson Date: Tue May 17 13:08:34 2016 -0400 Fix documentation for routerinfo_incompatible_with_extrainfo --- src/or/routerlist.c | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-)

[tor-commits] [tor/release-0.2.8] Fix another, more subtle, case of bug 17150.

2016-05-19 Thread nickm
commit 49ff09aef27d2883b77008be56c29def2a6a8dff Author: Nick Mathewson Date: Tue May 17 13:16:36 2016 -0400 Fix another, more subtle, case of bug 17150. We need to make sure that the corresponding sd and ei match in their certificates. ---

[tor-commits] [tor/release-0.2.8] Move extra_info_digest256 into signed_descriptor_t

2016-05-19 Thread nickm
commit 44da47d3c1e4809d5aaf91cd708c6f02b01a5396 Author: Nick Mathewson Date: Tue May 17 12:53:12 2016 -0400 Move extra_info_digest256 into signed_descriptor_t This patch includes no semantic changes; it's just a field movement. It's prerequisite for

[tor-commits] [tor/release-0.2.8] Remove consensus_max_download_tries by refactoring

2016-05-19 Thread nickm
commit ab0a7e2961378ff0fb7f5061d6b1cdeebe7afa98 Author: teor (Tim Wilson-Brown) Date: Wed May 18 18:07:40 2016 -0400 Remove consensus_max_download_tries by refactoring No behaviour change This function is used twice. The code is simpler if we split

[tor-commits] [tor/release-0.2.8] use the new function here too

2016-05-19 Thread nickm
commit 59da060f10e6abd1681ad004410d52ce1781 Author: Roger Dingledine Date: Wed Apr 13 01:30:29 2016 -0400 use the new function here too --- src/or/networkstatus.c | 15 +-- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git

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

2016-05-19 Thread nickm
commit 3f49474349538be499ab485c697c147c8829fa0d Merge: d6a2fec 00f74e0 Author: Nick Mathewson Date: Tue May 17 19:47:22 2016 -0400 Merge branch 'bug17150_027_extra' into maint-0.2.8 changes/bug17150 | 7 +++ src/or/dirserv.c | 9 ++--- src/or/or.h

[tor-commits] [tor/release-0.2.8] stop looping once we know what the answer will be

2016-05-19 Thread nickm
commit aa6341d4b9159e02825a03f1490ce6b731c2a90e Author: Roger Dingledine Date: Fri May 6 09:55:06 2016 -0400 stop looping once we know what the answer will be suggested during code review by dgoulet --- src/or/networkstatus.c | 4 +++- 1 file changed, 3

[tor-commits] [tor/release-0.2.8] remove some more unused code

2016-05-19 Thread nickm
commit c98fbd4169d70033c5058994cab5cfbd24cf4e78 Author: Roger Dingledine Date: Thu Apr 14 02:18:25 2016 -0400 remove some more unused code --- src/or/connection.c | 45 - src/or/connection.h | 7 --- 2 files changed, 52

[tor-commits] [tor/master] Fix a compilation error in test_dir.c

2016-05-19 Thread nickm
commit 06803c317f3865b2a365c4485618828f60bd5de9 Author: Nick Mathewson Date: Thu May 19 08:27:11 2016 -0400 Fix a compilation error in test_dir.c --- src/test/test_dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_dir.c

[tor-commits] [tor/release-0.2.8] avoid another redundant check

2016-05-19 Thread nickm
commit bcae392e0edc682990da71524a0802cf79e3e698 Author: Roger Dingledine Date: Wed Apr 13 03:13:12 2016 -0400 avoid another redundant check we should avoid launching a consensus fetch if we don't want one, but if we do end up with an extra one, we should

[tor-commits] [tor/release-0.2.8] Changes file for bug 18809

2016-05-19 Thread nickm
commit 8dc8d712260a16eb9811b57abd4928081316f495 Author: teor (Tim Wilson-Brown) Date: Wed May 18 18:04:02 2016 -0400 Changes file for bug 18809 --- changes/bug18809 | 14 ++ 1 file changed, 14 insertions(+) diff --git a/changes/bug18809 b/changes/bug18809

[tor-commits] [tor/release-0.2.8] fix a bug where relays would use the aggressive client bootstrapping retry number

2016-05-19 Thread nickm
commit 1f72653544272e24d685bd81abe2da5d32b67caf Author: Roger Dingledine Date: Thu Apr 14 03:03:47 2016 -0400 fix a bug where relays would use the aggressive client bootstrapping retry number --- src/or/networkstatus.c | 3 +-- 1 file changed, 1 insertion(+), 2

[tor-commits] [tor/release-0.2.8] When making sure digest256 matches in ei, look at sd, not ri.

2016-05-19 Thread nickm
commit 7d1eb0d57086c9630f7797916d9d2c948117a7e1 Author: Nick Mathewson Date: Tue May 17 12:57:03 2016 -0400 When making sure digest256 matches in ei, look at sd, not ri. The routerinfo we pass to routerinfo_incompatible_with_extrainfo is the latest

[tor-commits] [tor/master] stop looping once we know what the answer will be

2016-05-19 Thread nickm
commit aa6341d4b9159e02825a03f1490ce6b731c2a90e Author: Roger Dingledine Date: Fri May 6 09:55:06 2016 -0400 stop looping once we know what the answer will be suggested during code review by dgoulet --- src/or/networkstatus.c | 4 +++- 1 file changed, 3

[tor-commits] [tor/release-0.2.8] get rid of the scattered checks to cancel a consensus fetch

2016-05-19 Thread nickm
commit e230e80ab3021caf8153d2ba09bab5cb185366dc Author: Roger Dingledine Date: Wed Apr 13 03:05:54 2016 -0400 get rid of the scattered checks to cancel a consensus fetch We'll back off from the request in connection_ap_handshake_attach_circuit, or cancel

[tor-commits] [tor/master] close other consensus fetches when we get a consensus

2016-05-19 Thread nickm
commit a7665df2f8607403e5e14bf1af7426cedfea01dc Author: Roger Dingledine Date: Wed Apr 13 02:54:31 2016 -0400 close other consensus fetches when we get a consensus not once per second, and only do it when a consensus arrives --- src/or/directory.c | 123

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

2016-05-19 Thread nickm
commit 9f217c83b0d91508af0d63f04216fa78cdbfbe1b Merge: 3f49474 f698b50 Author: Nick Mathewson Date: Thu May 19 08:17:02 2016 -0400 Merge branch 'bug18809_028_squashed' into maint-0.2.8 changes/bug18809 | 14 ++ src/or/circuituse.c| 19 +++

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

2016-05-19 Thread nickm
commit a7a44f2db0b6732ed53a24186dc09eea50296a20 Merge: d718c71 7c7d990 Author: Nick Mathewson Date: Thu May 19 08:29:58 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18809| 2 +- src/test/test_dir.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

[tor-commits] [tor/master] Restore and improve download schedule unit tests

2016-05-19 Thread nickm
commit d5c70d71027644efb31d16d17b46d43484b46b18 Author: teor (Tim Wilson-Brown) Date: Wed May 18 21:31:03 2016 -0400 Restore and improve download schedule unit tests --- src/or/networkstatus.c | 8 +-- src/or/networkstatus.h | 6 +- src/test/test_dir.c| 153

[tor-commits] [tor/master] Add unit tests for networkstatus_consensus_is_bootstrapping

2016-05-19 Thread nickm
commit f698b509d8efdc055cfc05c6feaf0aecee41b9d0 Author: teor (Tim Wilson-Brown) Date: Wed May 18 22:05:35 2016 -0400 Add unit tests for networkstatus_consensus_is_bootstrapping --- src/or/microdesc.c | 4 ++-- src/or/microdesc.h | 2 +-

[tor-commits] [tor/master] Stop downloading consensuses when a consensus has been downloaded

2016-05-19 Thread nickm
commit 84ab26c320151bde1fc52906266126aa8d7780a3 Author: teor (Tim Wilson-Brown) Date: Wed May 18 17:50:46 2016 -0400 Stop downloading consensuses when a consensus has been downloaded Previosuly, during bootstrap, we would continue to download consensuses if

[tor-commits] [tor/release-0.2.8] avoid following through on a consensus fetch if we have one already arriving

2016-05-19 Thread nickm
commit 91c58013be735584acc674a60bb18d1efb38f25a Author: Roger Dingledine Date: Wed Apr 13 01:08:17 2016 -0400 avoid following through on a consensus fetch if we have one already arriving --- src/or/circuituse.c| 19 ++ src/or/networkstatus.c | 53

[tor-commits] [tor/master] Update unit tests for multiple bootstrap connections

2016-05-19 Thread nickm
commit 4254d0297c53155d582a51976b8e5bb41abfced6 Author: teor (Tim Wilson-Brown) Date: Wed May 18 20:21:31 2016 -0400 Update unit tests for multiple bootstrap connections --- src/test/test_connection.c | 405 - 1 file changed,

[tor-commits] [tor/master] changelog typo fix

2016-05-19 Thread nickm
commit 7c7d990704219ff1033dc9dc257378757ad7cecf Author: Nick Mathewson Date: Thu May 19 08:29:45 2016 -0400 changelog typo fix --- changes/bug18809 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug18809 b/changes/bug18809 index

[tor-commits] [tor/release-0.2.8] Copy the signing_key_cert field into signed_descriptor_t

2016-05-19 Thread nickm
commit 8acfac7375e7a0692193434704984d7eb507faf1 Author: Nick Mathewson Date: Tue May 17 13:14:04 2016 -0400 Copy the signing_key_cert field into signed_descriptor_t We need this field to be in signed_descriptor_t so that

[tor-commits] [tor/master] Changes file for bug 18809

2016-05-19 Thread nickm
commit 8dc8d712260a16eb9811b57abd4928081316f495 Author: teor (Tim Wilson-Brown) Date: Wed May 18 18:04:02 2016 -0400 Changes file for bug 18809 --- changes/bug18809 | 14 ++ 1 file changed, 14 insertions(+) diff --git a/changes/bug18809 b/changes/bug18809

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

2016-05-19 Thread nickm
commit d718c717a67051cb1da2a1f80c70401d0d10b374 Merge: 159ea7a 9f217c8 Author: Nick Mathewson Date: Thu May 19 08:25:12 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18809 | 14 ++ src/or/circuituse.c| 19 +++ src/or/connection.c| 45

[tor-commits] [tor/master] fix a bug where relays would use the aggressive client bootstrapping retry number

2016-05-19 Thread nickm
commit 1f72653544272e24d685bd81abe2da5d32b67caf Author: Roger Dingledine Date: Thu Apr 14 03:03:47 2016 -0400 fix a bug where relays would use the aggressive client bootstrapping retry number --- src/or/networkstatus.c | 3 +-- 1 file changed, 1 insertion(+), 2

[tor-commits] [tor/master] Remove consensus_max_download_tries by refactoring

2016-05-19 Thread nickm
commit ab0a7e2961378ff0fb7f5061d6b1cdeebe7afa98 Author: teor (Tim Wilson-Brown) Date: Wed May 18 18:07:40 2016 -0400 Remove consensus_max_download_tries by refactoring No behaviour change This function is used twice. The code is simpler if we split

[tor-commits] [tor/master] avoid following through on a consensus fetch if we have one already arriving

2016-05-19 Thread nickm
commit 91c58013be735584acc674a60bb18d1efb38f25a Author: Roger Dingledine Date: Wed Apr 13 01:08:17 2016 -0400 avoid following through on a consensus fetch if we have one already arriving --- src/or/circuituse.c| 19 ++ src/or/networkstatus.c | 53

[tor-commits] [tor/master] get rid of another no-longer-used function

2016-05-19 Thread nickm
commit 53aaed81dd34f227366b0a0c9b143c4c43a5529e Author: Roger Dingledine Date: Tue May 10 11:16:30 2016 -0400 get rid of another no-longer-used function --- src/or/networkstatus.c | 34 -- src/or/networkstatus.h | 1 - 2 files changed,

[tor-commits] [tor/master] avoid another redundant check

2016-05-19 Thread nickm
commit bcae392e0edc682990da71524a0802cf79e3e698 Author: Roger Dingledine Date: Wed Apr 13 03:13:12 2016 -0400 avoid another redundant check we should avoid launching a consensus fetch if we don't want one, but if we do end up with an extra one, we should

[tor-commits] [tor/master] fix typos/etc before i go nuts on #18809

2016-05-19 Thread nickm
commit ce8266d52d296333eb1a735225e620760aab8802 Author: Roger Dingledine Date: Wed Apr 13 00:06:30 2016 -0400 fix typos/etc before i go nuts on #18809 --- src/or/directory.c | 12 ++-- src/or/main.c | 2 +- src/or/networkstatus.c | 17

[tor-commits] [tor/master] use the new function here too

2016-05-19 Thread nickm
commit 59da060f10e6abd1681ad004410d52ce1781 Author: Roger Dingledine Date: Wed Apr 13 01:30:29 2016 -0400 use the new function here too --- src/or/networkstatus.c | 15 +-- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git

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

2016-05-19 Thread nickm
commit 9f217c83b0d91508af0d63f04216fa78cdbfbe1b Merge: 3f49474 f698b50 Author: Nick Mathewson Date: Thu May 19 08:17:02 2016 -0400 Merge branch 'bug18809_028_squashed' into maint-0.2.8 changes/bug18809 | 14 ++ src/or/circuituse.c| 19 +++

[tor-commits] [tor/maint-0.2.8] Fix a compilation error in test_dir.c

2016-05-19 Thread nickm
commit 06803c317f3865b2a365c4485618828f60bd5de9 Author: Nick Mathewson Date: Thu May 19 08:27:11 2016 -0400 Fix a compilation error in test_dir.c --- src/test/test_dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_dir.c

[tor-commits] [tor/master] remove some more unused code

2016-05-19 Thread nickm
commit c98fbd4169d70033c5058994cab5cfbd24cf4e78 Author: Roger Dingledine Date: Thu Apr 14 02:18:25 2016 -0400 remove some more unused code --- src/or/connection.c | 45 - src/or/connection.h | 7 --- 2 files changed, 52

[tor-commits] [tor/maint-0.2.8] Update unit tests for multiple bootstrap connections

2016-05-19 Thread nickm
commit 4254d0297c53155d582a51976b8e5bb41abfced6 Author: teor (Tim Wilson-Brown) Date: Wed May 18 20:21:31 2016 -0400 Update unit tests for multiple bootstrap connections --- src/test/test_connection.c | 405 - 1 file changed,

[tor-commits] [tor/maint-0.2.8] get rid of another no-longer-used function

2016-05-19 Thread nickm
commit 53aaed81dd34f227366b0a0c9b143c4c43a5529e Author: Roger Dingledine Date: Tue May 10 11:16:30 2016 -0400 get rid of another no-longer-used function --- src/or/networkstatus.c | 34 -- src/or/networkstatus.h | 1 - 2 files changed,

[tor-commits] [tor/maint-0.2.8] changelog typo fix

2016-05-19 Thread nickm
commit 7c7d990704219ff1033dc9dc257378757ad7cecf Author: Nick Mathewson Date: Thu May 19 08:29:45 2016 -0400 changelog typo fix --- changes/bug18809 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug18809 b/changes/bug18809 index

[tor-commits] [tor/maint-0.2.8] stop looping once we know what the answer will be

2016-05-19 Thread nickm
commit aa6341d4b9159e02825a03f1490ce6b731c2a90e Author: Roger Dingledine Date: Fri May 6 09:55:06 2016 -0400 stop looping once we know what the answer will be suggested during code review by dgoulet --- src/or/networkstatus.c | 4 +++- 1 file changed, 3

[tor-commits] [tor/maint-0.2.8] fix a bug where relays would use the aggressive client bootstrapping retry number

2016-05-19 Thread nickm
commit 1f72653544272e24d685bd81abe2da5d32b67caf Author: Roger Dingledine Date: Thu Apr 14 03:03:47 2016 -0400 fix a bug where relays would use the aggressive client bootstrapping retry number --- src/or/networkstatus.c | 3 +-- 1 file changed, 1 insertion(+), 2

[tor-commits] [tor/maint-0.2.8] get rid of the scattered checks to cancel a consensus fetch

2016-05-19 Thread nickm
commit e230e80ab3021caf8153d2ba09bab5cb185366dc Author: Roger Dingledine Date: Wed Apr 13 03:05:54 2016 -0400 get rid of the scattered checks to cancel a consensus fetch We'll back off from the request in connection_ap_handshake_attach_circuit, or cancel

[tor-commits] [tor/master] get rid of the scattered checks to cancel a consensus fetch

2016-05-19 Thread nickm
commit e230e80ab3021caf8153d2ba09bab5cb185366dc Author: Roger Dingledine Date: Wed Apr 13 03:05:54 2016 -0400 get rid of the scattered checks to cancel a consensus fetch We'll back off from the request in connection_ap_handshake_attach_circuit, or cancel

[tor-commits] [tor/maint-0.2.8] Add unit tests for networkstatus_consensus_is_bootstrapping

2016-05-19 Thread nickm
commit f698b509d8efdc055cfc05c6feaf0aecee41b9d0 Author: teor (Tim Wilson-Brown) Date: Wed May 18 22:05:35 2016 -0400 Add unit tests for networkstatus_consensus_is_bootstrapping --- src/or/microdesc.c | 4 ++-- src/or/microdesc.h | 2 +-

[tor-commits] [tor/maint-0.2.8] remove some more unused code

2016-05-19 Thread nickm
commit c98fbd4169d70033c5058994cab5cfbd24cf4e78 Author: Roger Dingledine Date: Thu Apr 14 02:18:25 2016 -0400 remove some more unused code --- src/or/connection.c | 45 - src/or/connection.h | 7 --- 2 files changed, 52

[tor-commits] [tor/master] simplify more -- we only call these funcs when bootstrapping

2016-05-19 Thread nickm
commit d5a96286c2877ab56455ea5183d1df2e39453cde Author: Roger Dingledine Date: Thu Apr 14 02:29:12 2016 -0400 simplify more -- we only call these funcs when bootstrapping --- src/or/networkstatus.c | 25 ++--- 1 file changed, 6 insertions(+), 19

  1   2   >