[tor-commits] [tor/master] Try to fix some more memory leaks in the unit tests

2015-01-23 Thread nickm
commit 8f9fb3e8fae31e3c14811911f23537cfecc6b780 Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 11:35:05 2015 -0500 Try to fix some more memory leaks in the unit tests --- src/test/test_address.c |2 +- src/test/test_config.c |1 + 2 files changed, 2 insertions(+), 1

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2015-01-23 Thread translation
commit 78fd46ad703c78f9257283707f8ccb6c3a1d990a Author: Translation commit bot translat...@torproject.org Date: Fri Jan 23 21:45:17 2015 + Update translations for liveusb-creator --- fr/fr.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fr/fr.po

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2015-01-23 Thread translation
commit d179a1d13be6e4529846ba1d5b1dcedc046d78ee Author: Translation commit bot translat...@torproject.org Date: Fri Jan 23 21:45:21 2015 + Update translations for liveusb-creator_completed --- fr/fr.po | 57 +++-- 1 file changed, 31

[tor-commits] [chutney/master] Document the environment variables CHUTNEY_TOR and CHUTNEY_TOR_GENCERT.

2015-01-23 Thread nickm
commit 000adfdf8bb47aa2542ffca44fc0e4d048891488 Author: cypherpunks cypherpu...@torproject.org Date: Fri Jan 23 11:12:55 2015 +0100 Document the environment variables CHUTNEY_TOR and CHUTNEY_TOR_GENCERT. --- README | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-)

[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4

2015-01-23 Thread nickm
commit df4c484021a2c4086084b82f9eade29231c038f9 Merge: dbd5a9a a9ce0cd Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 08:52:35 2015 -0500 Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4 changes/geoip6-january2015 |2 + src/config/geoip6 |

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'

2015-01-23 Thread nickm
commit d8517fe8435dbe9e4593d04fa8ec4db464513892 Merge: 4a6b43b 7cbdec5 Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 08:53:21 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/geoip-january2015 |3 + changes/geoip6-january2015 |2 +

[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4

2015-01-23 Thread nickm
commit df4c484021a2c4086084b82f9eade29231c038f9 Merge: dbd5a9a a9ce0cd Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 08:52:35 2015 -0500 Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4 changes/geoip6-january2015 |2 + src/config/geoip6 |

[tor-commits] [tor/maint-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2015-01-23 Thread nickm
commit 7cbdec578b291da11dcd419988ee985b7589ec48 Merge: ba17cdf df4c484 Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 08:52:55 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/geoip-january2015 |3 + changes/geoip6-january2015 |2

[tor-commits] [tor/maint-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

2015-01-23 Thread nickm
commit dbd5a9a8f99d92b38f85728edf21b9c6bfe87f38 Merge: 137982f c3f8f5a Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 08:52:20 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-january2015 |3 + src/config/geoip |12872

[tor-commits] [tor/maint-0.2.5] Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4

2015-01-23 Thread nickm
commit df4c484021a2c4086084b82f9eade29231c038f9 Merge: dbd5a9a a9ce0cd Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 08:52:35 2015 -0500 Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4 changes/geoip6-january2015 |2 + src/config/geoip6 |

[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

2015-01-23 Thread nickm
commit dbd5a9a8f99d92b38f85728edf21b9c6bfe87f38 Merge: 137982f c3f8f5a Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 08:52:20 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-january2015 |3 + src/config/geoip |12872

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

2015-01-23 Thread nickm
commit dbd5a9a8f99d92b38f85728edf21b9c6bfe87f38 Merge: 137982f c3f8f5a Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 08:52:20 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-january2015 |3 + src/config/geoip |12872

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2015-01-23 Thread nickm
commit 7cbdec578b291da11dcd419988ee985b7589ec48 Merge: ba17cdf df4c484 Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 08:52:55 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/geoip-january2015 |3 + changes/geoip6-january2015 |2

[tor-commits] [tor/master] Merge remote-tracking branch 'public/ticket13762'

2015-01-23 Thread nickm
commit b677ccd3aba80f4b66f16e6e1c0e3c68b49106c5 Merge: d8517fe 90db394 Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 08:55:31 2015 -0500 Merge remote-tracking branch 'public/ticket13762' changes/ticket13762 |5 + src/or/routerlist.c | 10 ++

[tor-commits] [tor/master] Downgrade warnings about extrainfo incompatibility when reading cache

2015-01-23 Thread nickm
commit 90db39448db254d87228e4b7b34c61a4dce6a634 Author: Nick Mathewson ni...@torproject.org Date: Wed Jan 7 13:11:06 2015 -0500 Downgrade warnings about extrainfo incompatibility when reading cache Fixes 13762. --- changes/ticket13762 |5 + src/or/routerlist.c | 10

[tor-commits] [tor/master] fix warnings from lintChanges

2015-01-23 Thread nickm
commit bd22ad12bd84019d00bcd92e2e2390cd910908ce Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 09:09:00 2015 -0500 fix warnings from lintChanges --- changes/bug12509 |4 ++-- changes/bug13111-generate-keys-on-empty-file |9 +++--

[tor-commits] [tor/master] Remove a needless if (1)

2015-01-23 Thread nickm
commit f591a4d94cfa6a8ad17fd126e9736196b10a266a Author: Arlo Breault arlo...@gmail.com Date: Tue Sep 23 12:14:41 2014 -0400 Remove a needless if (1) --- src/or/directory.c | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/or/directory.c

[tor-commits] [tor/master] fixup! Download microdescriptors if you're a cache

2015-01-23 Thread nickm
commit 06bda506003826bf9a28aec3afe0b7b1ae6cc9c0 Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 23 12:32:02 2014 -0400 fixup! Download microdescriptors if you're a cache --- src/or/routerlist.c |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git

[tor-commits] [tor/master] Merge remote-tracking branch 'public/ticket9969'

2015-01-23 Thread nickm
commit 5d4bb6f61f360ddcbee83476ff2f93a13f3a19c0 Merge: bd22ad1 ac9b0a3 Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 09:36:00 2015 -0500 Merge remote-tracking branch 'public/ticket9969' Conflicts: src/or/directory.c src/or/routerlist.c

[tor-commits] [tor/master] Refactor initiate_descriptor_downloads() to be safer

2015-01-23 Thread nickm
commit 21d5dbd474d5dad10a2bfa800df078f7fdc8c40b Author: Arlo Breault arlo...@gmail.com Date: Tue Sep 23 12:21:08 2014 -0400 Refactor initiate_descriptor_downloads() to be safer (It's smarter to use asprintf and join than character pointers and a long buffer.) ---

[tor-commits] [tor/master] fixup! Make router_pick_directory_server respect PDS_NO_EXISTING_*

2015-01-23 Thread nickm
commit 55b21b366c4a8c237dda0a967c0c499e18fb0b4c Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 23 12:47:39 2014 -0400 fixup! Make router_pick_directory_server respect PDS_NO_EXISTING_* Document n_busy_out, and set it correctly when we goto retry_without_exclude. ---

[tor-commits] [tor/master] Fix a comment typo.

2015-01-23 Thread nickm
commit 2e168566654957cb708d7484c28778e110384ae4 Author: Arlo Breault arlo...@gmail.com Date: Tue Sep 23 12:11:06 2014 -0400 Fix a comment typo. --- src/or/directory.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index

[tor-commits] [tor/master] Re-enable last resort attempt to get via tor.

2015-01-23 Thread nickm
commit f752093e16a8a492f2b9b14255211f68548dc060 Author: Arlo Breault arlo...@gmail.com Date: Tue Sep 23 12:15:10 2014 -0400 Re-enable last resort attempt to get via tor. This looks like a bug introduced in af658b7828e2ab814d70acbbb99f414dee239def. --- src/or/directory.c |9

[tor-commits] [tor/master] fixup! Unit tests for router download functions.

2015-01-23 Thread nickm
commit 482e3cfa0969775233d3f903639c44f32ddaf820 Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 23 12:38:43 2014 -0400 fixup! Unit tests for router download functions. Fix compilation warnings --- src/test/test_dir.c | 12 ++-- 1 file changed, 6 insertions(+),

[tor-commits] [tor/master] Split dirinfo_type_t computation into a new function

2015-01-23 Thread nickm
commit c00b397992edefb4507f2c1408e289243f5c7916 Author: Arlo Breault arlo...@gmail.com Date: Tue Sep 23 12:12:57 2014 -0400 Split dirinfo_type_t computation into a new function --- src/or/directory.c | 84 ++-- src/or/directory.h | 11

[tor-commits] [tor/master] fixup! Make router_pick_directory_server respect PDS_NO_EXISTING_*

2015-01-23 Thread nickm
commit cae0e7b06bcb75494f75cb29fc0f9a356c284bf4 Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 23 12:30:47 2014 -0400 fixup! Make router_pick_directory_server respect PDS_NO_EXISTING_* Clean up comments on PDS_NO_EXISTING_* --- src/or/or.h | 11 +-- 1 file

[tor-commits] [tor/master] Unit tests for router download functions.

2015-01-23 Thread nickm
commit bb137e23c1c30f7e9f469d4924bbce2bb9b2d2ed Author: Arlo Breault arlo...@gmail.com Date: Tue Sep 23 12:22:36 2014 -0400 Unit tests for router download functions. Also, sort test suites alphabetically. --- src/test/include.am |7 --- src/test/test.c | 32

[tor-commits] [tor/master] Send long URLs when requesting ordinary server descriptors too.

2015-01-23 Thread nickm
commit 6523eff9b3b5e06521da010e238b4cd23ed24e82 Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 23 13:04:22 2014 -0400 Send long URLs when requesting ordinary server descriptors too. --- src/or/routerlist.c |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] fixup! Send more descriptor requests per attempt when using tunneled connections

2015-01-23 Thread nickm
commit 02464694b2fa901e04b8a8f1c467a0773e6d4c27 Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 23 12:34:17 2014 -0400 fixup! Send more descriptor requests per attempt when using tunneled connections Compilation fixes --- src/or/routerlist.c | 16 +--- 1

[tor-commits] [tor/master] Send more descriptor requests per attempt when using tunneled connections

2015-01-23 Thread nickm
commit 5ed5ac185bf6f30438af1638f30e04418ed27aff Author: Arlo Breault arlo...@gmail.com Date: Tue Sep 23 12:22:28 2014 -0400 Send more descriptor requests per attempt when using tunneled connections --- src/or/directory.c |3 +- src/or/routerlist.c | 152

[tor-commits] [tor/master] fixup! Send more descriptor requests per attempt when using tunneled connections

2015-01-23 Thread nickm
commit 055ad9c5fb0de4295ccb05357d6a2d8ad29d03e4 Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 23 12:57:10 2014 -0400 fixup! Send more descriptor requests per attempt when using tunneled connections Limit the number of simultaneous connections to a single router for

[tor-commits] [tor/master] Try to make max_dl_per_request a bit smarter

2015-01-23 Thread nickm
commit ac9b0a3110ea4eea63133c6d2e3572b2cfd22bd6 Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 10:56:38 2014 -0400 Try to make max_dl_per_request a bit smarter --- src/or/routerlist.c | 18 +++--- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git

[tor-commits] [tor/master] Tweak the 9969 fix a little

2015-01-23 Thread nickm
commit 6c443e987d318aabb92fc8acc25cf6ce82692118 Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 09:37:08 2015 -0500 Tweak the 9969 fix a little If we have busy nodes and excluded nodes, then don't retry with the excluded ones enabled. Instead, wait for the busy

[tor-commits] [tor/master] changes file for 9969

2015-01-23 Thread nickm
commit 0b121433464804889240a6884179fa4631f0d7b0 Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 10:02:49 2015 -0500 changes file for 9969 --- changes/ticket9969 |8 1 file changed, 8 insertions(+) diff --git a/changes/ticket9969 b/changes/ticket9969 new file mode

[tor-commits] [tor/master] Make router_pick_directory_server respect PDS_NO_EXISTING_*

2015-01-23 Thread nickm
commit 29f15a97edb05d175b97154e0b1c96fd04485ee2 Author: Arlo Breault arlo...@gmail.com Date: Tue Sep 23 12:19:15 2014 -0400 Make router_pick_directory_server respect PDS_NO_EXISTING_* --- src/or/routerlist.c | 53 +-- 1 file changed, 43

[tor-commits] [tor/master] fixup! Refactor initiate_descriptor_downloads() to be safer

2015-01-23 Thread nickm
commit 0fdfdae7e3a88a9172a51f36ac6b536b5687d401 Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 23 12:56:16 2014 -0400 fixup! Refactor initiate_descriptor_downloads() to be safer Calculate digest_len correctly. Also, refactor setting of initial variables to look

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

2015-01-23 Thread nickm
commit 034e2788f812852ed530b42291b3e07c7dc85d84 Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 11:18:28 2015 -0500 whitespace fixes --- src/or/circuitbuild.h |3 ++- src/or/config.c |1 - src/or/cpuworker.c |1 - src/or/directory.c

[tor-commits] [tor/master] Split the slow unit tests into their own binary

2015-01-23 Thread nickm
commit 7322de15dc2f0858291f40df1a55a66c80b7fda9 Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 11:15:53 2015 -0500 Split the slow unit tests into their own binary This can run in parallel with the faster ones and the other tests. --- .gitignore |

[tor-commits] [tor/master] Fix some memory leaks in new address tests

2015-01-23 Thread nickm
commit 614fbf1812690eb1cc2f52289d72ad2839f0ef9c Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 11:26:40 2015 -0500 Fix some memory leaks in new address tests --- src/test/test_address.c |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git

[tor-commits] [tor/master] fixup! Unit tests for router download functions.

2015-01-23 Thread nickm
commit fa80983e52cd5213ca2019024eafdc846a720f99 Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 09:59:55 2014 -0400 fixup! Unit tests for router download functions. (Add missing test_routerlist.c that I forgot to add from arlo's branch last time. Oops.) ---

[tor-commits] [tor/master] Refactor code that looks up addresses from interfaces

2015-01-23 Thread nickm
commit 3966145dff817adb67e5b46020632d55f19e289f Author: rl1987 rl1...@sdf.lonestar.org Date: Sat May 24 15:03:14 2014 +0300 Refactor code that looks up addresses from interfaces Now the code has separate implementation and examination functions, uses smartlists sanely, and has

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

2015-01-23 Thread nickm
commit 420037dcefade09f43e4a6e44282ed04f9f3ac52 Merge: 0b12143 3966145 Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 10:13:37 2015 -0500 Merge branch 'if_addr_refactoring_squashed' Conflicts: src/test/include.am src/test/test.c