[tor-commits] [tor/master] Fix a logic error in connection_tls_continue_handshake().

2015-11-25 Thread nickm
commit dce708d11c4ec94ece2fd49b6b697df759f93ef1 Author: Nick Mathewson Date: Wed Nov 25 09:12:50 2015 -0500 Fix a logic error in connection_tls_continue_handshake(). (If we take the branch above this assertion, than we *didn't* have a v1 handshake. So if

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

2015-11-25 Thread nickm
commit 289b184e112885d4feb9569c77d322995b9417c7 Merge: 5dff4ae dce708d Author: Nick Mathewson Date: Wed Nov 25 12:25:44 2015 -0500 Merge branch 'bug17654_try1' src/or/connection_or.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [webwml/master] Give the footer a bit more space

2015-11-25 Thread sebastian
commit 7debd7b84d01160fc48e675642372687f5b04f59 Author: Sebastian Hahn Date: Wed Nov 25 16:50:50 2015 +0100 Give the footer a bit more space --- include/donatehead.wmi |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/donatehead.wmi

[tor-commits] [webwml/master] Provide a height for the page footer

2015-11-25 Thread sebastian
commit 0f0351daae4e0b4dadc1975d021d9ca318a22bbd Author: Sebastian Hahn Date: Wed Nov 25 17:27:26 2015 +0100 Provide a height for the page footer --- include/donatehead.wmi |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

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

2015-11-25 Thread nickm
commit e5754c42d124549b3fd8e8d7c11d4dde3b5acec1 Merge: c875265 943369f Author: Nick Mathewson Date: Wed Nov 25 22:33:49 2015 -0500 Merge branch 'bug17686_v2_027' changes/bug17686 |4 src/common/compat.h|2 ++

[tor-commits] [tor/master] Add a changes file for bug 17686

2015-11-25 Thread nickm
commit 943369f927967268cacd2067ccae0bc5f1c5835e Author: Nick Mathewson Date: Wed Nov 25 13:25:21 2015 -0500 Add a changes file for bug 17686 --- changes/bug17686 |4 1 file changed, 4 insertions(+) diff --git a/changes/bug17686 b/changes/bug17686 new file

[tor-commits] [tor/master] fixup! Add controller getinfo exit-policy/reject-private

2015-11-25 Thread nickm
commit e14f9dd44f637c0211530e5e630eba1a129d1650 Author: teor (Tim Wilson-Brown) Date: Mon Nov 23 08:46:26 2015 +1100 fixup! Add controller getinfo exit-policy/reject-private Stop ignoring ExitPolicyRejectPrivate in getinfo exit-policy/reject-private. Fix a

[tor-commits] [tor/master] Fix documentation for crypto_rand*

2015-11-25 Thread nickm
commit 1cfa2bc859c0a7f27b49b80dc1be4be2acc91ee8 Author: Nick Mathewson Date: Wed Nov 25 12:28:20 2015 -0500 Fix documentation for crypto_rand* --- src/common/crypto.c | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff --git

[tor-commits] [tor/master] Now that crypto_rand() cannot fail, it should return void.

2015-11-25 Thread nickm
commit ddcbe264745a0c10d80d8ad74125d23eb251662d Author: Nick Mathewson Date: Wed Nov 25 10:42:00 2015 -0500 Now that crypto_rand() cannot fail, it should return void. --- src/common/crypto.c| 12 +--- src/common/crypto.h|4 ++--

[tor-commits] [tor/master] Make crypto_seed_rng() and crypto_rand() less scary.

2015-11-25 Thread nickm
commit dedea28c2ef59eb86f5d9704e5609ae13fa8b3c2 Author: Nick Mathewson Date: Wed Nov 25 10:30:58 2015 -0500 Make crypto_seed_rng() and crypto_rand() less scary. These functions must really never fail; so have crypto_rand() assert that it's working okay,

[tor-commits] [tor/master] Add crypto-initializer functions to those whose return values must be checked

2015-11-25 Thread nickm
commit 10fdee628552bca65ddb86b17e0b057628ad3703 Author: Nick Mathewson Date: Wed Nov 25 10:36:34 2015 -0500 Add crypto-initializer functions to those whose return values must be checked --- src/common/crypto.c |3 ++- src/common/crypto.h |4 ++--

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/check-crypto-errors-v2'

2015-11-25 Thread nickm
commit c875265bbbddc50674f65169ee49d5612bef72a7 Merge: e14f9dd b1b8f79 Author: Nick Mathewson Date: Wed Nov 25 22:28:12 2015 -0500 Merge remote-tracking branch 'teor/check-crypto-errors-v2' changes/check-crypto-errors |5 + src/common/crypto.c |7

[tor-commits] [tor/master] Check the return value of HMAC in crypto.c and assert on error

2015-11-25 Thread nickm
commit b1b8f7982ebac1347a86d5eb9eee8e5f3bd3d39c Author: teor (Tim Wilson-Brown) Date: Mon Nov 23 20:53:59 2015 +1100 Check the return value of HMAC in crypto.c and assert on error Fixes bug #17658; bugfix on commit in fdbb9cdf746b (11 Oct 2011) in tor

[tor-commits] [tor-browser/tor-browser-38.4.0esr-5.5-1] Bug 16940: After update, load local change notes.

2015-11-25 Thread gk
commit 4a726fc8a675c0882cbfba2514deb32b53ade2ab Author: Kathy Brade Date: Wed Nov 25 11:36:20 2015 -0500 Bug 16940: After update, load local change notes. Add an about:tbupdate page that displays the first section from TorBrowser/Docs/ChangeLog.txt and

[tor-commits] [torbutton/master] Bug 16940: After update, load local change notes.

2015-11-25 Thread gk
commit 9b800ffc669f7eb7dd6203a24aa85a39b5edd154 Author: Kathy Brade Date: Thu Nov 19 10:13:11 2015 -0500 Bug 16940: After update, load local change notes. Include the localizable strings for the about:tbupdate page in Torbutton. ---

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

2015-11-25 Thread translation
commit d616b7c1c02c54630fb7d492a9c7121053d5a7d6 Author: Translation commit bot Date: Wed Nov 25 15:15:03 2015 + Update translations for bridgedb --- th/LC_MESSAGES/bridgedb.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[tor-commits] [webwml/master] Fix links in donate page header

2015-11-25 Thread sebastian
commit 9ecd1937383fb4a80c9896cae7e8b174a8cf23b2 Author: Sebastian Hahn Date: Wed Nov 25 11:10:02 2015 +0100 Fix links in donate page header --- include/donatehead.wmi |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

[tor-commits] [webwml/master] Add link to donor page (#17681)

2015-11-25 Thread sebastian
commit cd0da7497adc1f435a0de4c409239c5fbe056ef5 Author: Sebastian Hahn Date: Wed Nov 25 11:04:57 2015 +0100 Add link to donor page (#17681) --- donate/en/donor-faq.wml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

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

2015-11-25 Thread translation
commit 77047490d3b7b06c3d1f2bb852eb8963c72598d9 Author: Translation commit bot Date: Wed Nov 25 13:45:03 2015 + Update translations for bridgedb --- th/LC_MESSAGES/bridgedb.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

[tor-commits] [tor/master] Merge remote-tracking branch 'gtank/feature17663'

2015-11-25 Thread nickm
commit 74e5385da701392c3fb72487753831b30a0b0c5c Merge: 2079ec9 1a7f6df Author: Nick Mathewson Date: Wed Nov 25 09:00:01 2015 -0500 Merge remote-tracking branch 'gtank/feature17663' changes/feature17663 |2 ++ src/common/crypto.c| 89

[tor-commits] [tor/master] add SHA512 support to crypto

2015-11-25 Thread nickm
commit ff54cc8481f88ecbc40a8abc0a1812fcf583ea73 Author: George Tankersley Date: Wed Nov 18 08:37:05 2015 + add SHA512 support to crypto --- src/common/crypto.c| 67 ++-- src/common/crypto.h| 19

[tor-commits] [tor/master] add changes for feature17663

2015-11-25 Thread nickm
commit 1a7f6df688d3879fd5ee378dfd8ea9f22a40020e Author: George Tankersley Date: Tue Nov 24 02:24:22 2015 + add changes for feature17663 --- changes/feature17663 |2 ++ 1 file changed, 2 insertions(+) diff --git a/changes/feature17663

[tor-commits] [tor/master] Tweak gtank's sha512 patch a little

2015-11-25 Thread nickm
commit 7194d3d95705a30cec69574ff2800cba8e739df9 Author: Nick Mathewson Date: Wed Nov 25 09:04:17 2015 -0500 Tweak gtank's sha512 patch a little --- changes/feature17663 |5 +++-- src/common/crypto.c |3 +-- 2 files changed, 4 insertions(+), 4 deletions(-)

[tor-commits] [tor/master] implement teor's comments

2015-11-25 Thread nickm
commit 695412302b37cf33c826e9af960474bed6180f3a Author: George Tankersley Date: Tue Nov 24 02:02:13 2015 + implement teor's comments --- src/common/crypto.c | 34 -- 1 file changed, 24 insertions(+), 10 deletions(-) diff

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

2015-11-25 Thread nickm
commit be30c61ac1553cf4401c832019e213be907c0711 Merge: 6cdd024 273b267 Author: Nick Mathewson Date: Wed Nov 25 08:53:46 2015 -0500 Merge branch 'maint-0.2.7' changes/bug16702 |4 src/or/rendservice.c |3 ++- 2 files changed, 6 insertions(+), 1

[tor-commits] [tor/master] Fix: use the right list in find_expiring_intro_point()

2015-11-25 Thread nickm
commit 273b267fa234c5a26c9beaacede42a496c880e05 Author: David Goulet Date: Mon Nov 23 09:02:54 2015 -0500 Fix: use the right list in find_expiring_intro_point() The wrong list was used when looking up expired intro points in a rend service object causing

[tor-commits] [tor/maint-0.2.7] Fix: use the right list in find_expiring_intro_point()

2015-11-25 Thread nickm
commit 273b267fa234c5a26c9beaacede42a496c880e05 Author: David Goulet Date: Mon Nov 23 09:02:54 2015 -0500 Fix: use the right list in find_expiring_intro_point() The wrong list was used when looking up expired intro points in a rend service object causing

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/feature8961-replaycache-sha256'

2015-11-25 Thread nickm
commit 2079ec9ee62e34fd46a12a7bba87a71df167d7ee Merge: be30c61 2e9779e Author: Nick Mathewson Date: Wed Nov 25 08:55:18 2015 -0500 Merge remote-tracking branch 'teor/feature8961-replaycache-sha256' changes/feature8961-replaycache-sha256 |4

[tor-commits] [tor/master] Use SHA256 in the replaycache, rather than SHA1

2015-11-25 Thread nickm
commit 2e9779e5d84db3e0d7b51ea34e73828253a298c2 Author: teor (Tim Wilson-Brown) Date: Tue Nov 24 09:08:53 2015 +1100 Use SHA256 in the replaycache, rather than SHA1 This migrates away from SHA1, and provides further hash flooding protection on top of the

[tor-commits] [tor/master] TestingLinkCertLifetime was misnamed as 'TestingLinkCertifetime'

2015-11-25 Thread nickm
commit 91b0ba1d197843848bea344e90704028779c4b7a Author: Damian Johnson Date: Mon Nov 23 17:51:30 2015 -0800 TestingLinkCertLifetime was misnamed as 'TestingLinkCertifetime' Simple typo - we were missing a letter. --- doc/tor.1.txt |2 +- 1 file changed,

[tor-commits] [tor/master] Merge remote-tracking branch 'atagar/man_page_fixes'

2015-11-25 Thread nickm
commit ab1bc38d5ae28be7666a2b896d45aebe3ec5ce4b Merge: 7194d3d dd63a6a Author: Nick Mathewson Date: Wed Nov 25 09:07:02 2015 -0500 Merge remote-tracking branch 'atagar/man_page_fixes' doc/tor.1.txt | 66 + 1

[tor-commits] [tor/master] Fix typo in comment on crypto_add_spaces_to_fp

2015-11-25 Thread nickm
commit 84d1373ba075febd5c362701a4dfee66ca9a5c19 Author: teor (Tim Wilson-Brown) Date: Mon Nov 23 18:59:11 2015 +1100 Fix typo in comment on crypto_add_spaces_to_fp --- src/common/crypto.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] Add a missing "if" in the comment on warn_nonlocal_controller_ports

2015-11-25 Thread nickm
commit d3b7546753fbf37dfe2dc5dc774492c8d501409f Author: teor (Tim Wilson-Brown) Date: Mon Nov 16 16:27:11 2015 +1100 Add a missing "if" in the comment on warn_nonlocal_controller_ports Also reflow all the lines of that comment so that they're under the

[tor-commits] [tor/master] Add missing " in AccountingMax comment in or.h

2015-11-25 Thread nickm
commit dd82550a5e8dab342ab1c5d46c51b781fa6ab568 Author: teor (Tim Wilson-Brown) Date: Mon Nov 16 12:34:53 2015 +1100 Add missing " in AccountingMax comment in or.h --- src/or/or.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/or.h

[tor-commits] [tor/master] Fix comments to describe actual return values (crypto.c)

2015-11-25 Thread nickm
commit 5b2adfb3d431b8f39cbddbd530840cacbb9b5ce5 Author: teor (Tim Wilson-Brown) Date: Mon Nov 23 20:31:57 2015 +1100 Fix comments to describe actual return values (crypto.c) --- src/common/crypto.c | 44 +--- 1 file changed, 25

[tor-commits] [tor/master] Comment only: crypto_seed_rng no longer has a "startup" parameter

2015-11-25 Thread nickm
commit 604d3ee48d5a407e525045138d45d40943b0eff6 Author: teor (Tim Wilson-Brown) Date: Mon Nov 23 10:26:07 2015 +1100 Comment only: crypto_seed_rng no longer has a "startup" parameter --- src/common/crypto.c |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

[tor-commits] [tor/master] Drop HidServDirectoryV2 and VoteOnHidServDirectoriesV2

2015-11-25 Thread nickm
commit 8661b4b5a2664f2bcda36d51371c0e141be497bd Author: Damian Johnson Date: Mon Nov 23 18:27:17 2015 -0800 Drop HidServDirectoryV2 and VoteOnHidServDirectoriesV2 These options were removed from tor in July. Time to axe them from our man page. :P

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

2015-11-25 Thread translation
commit 688fb9f184176e90593a578008194b02e17ce84e Author: Translation commit bot Date: Wed Nov 25 14:15:03 2015 + Update translations for bridgedb --- th/LC_MESSAGES/bridgedb.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git

[tor-commits] [tor/maint-0.2.7] Include netinet/in.h (if detected) in check for net/pfvar.h

2015-11-25 Thread nickm
commit 232ccc18c40f0d0302b2e21b0f67885c548f8e63 Author: Nick Mathewson Date: Wed Nov 25 09:27:52 2015 -0500 Include netinet/in.h (if detected) in check for net/pfvar.h Patch from rubiate; fixes bug 17551. --- changes/bug17551 |4 configure.ac |

[tor-commits] [tor/master] fixup! Block OutboundBindAddressIPv[4|6]_ and configured ports on exit relays

2015-11-25 Thread nickm
commit a09e7cd31a16244793c0848321c25e9cf6d8046f Author: teor (Tim Wilson-Brown) Date: Mon Nov 23 08:38:32 2015 +1100 fixup! Block OutboundBindAddressIPv[4|6]_ and configured ports on exit relays Fix unit tests for get_interface_address6_list to assume less

[tor-commits] [tor/master] ControlPort's section on flags wasn't indented

2015-11-25 Thread nickm
commit 690b66ce48f98b9bf109d63ccce93a329e06d8cc Author: Damian Johnson Date: Mon Nov 23 17:25:26 2015 -0800 ControlPort's section on flags wasn't indented Minor formatting issue with our ControlPort entry. The part about flags wasn't indented with the

[tor-commits] [tor/master] Malformed ExtORPort entry in man page

2015-11-25 Thread nickm
commit 4417effa52d24a665a4eb65c2533283dcb4f1fec Author: Damian Johnson Date: Mon Nov 23 17:23:14 2015 -0800 Malformed ExtORPort entry in man page Minor formatting issue with our ExtORPort that caused its description to be on the same line as the option

[tor-commits] [tor/master] Note in man page where users can file bugs

2015-11-25 Thread nickm
commit 5812930dc1cc6577955e9dfef0f77e9ed27a6e0d Author: Damian Johnson Date: Mon Nov 23 17:26:46 2015 -0800 Note in man page where users can file bugs In addition to inviting users to tell us about bugs, lets say where. --- doc/tor.1.txt |2 +- 1 file

[tor-commits] [tor/master] Fixes for tor's man page

2015-11-25 Thread nickm
commit dd63a6a73660ba4880eaf132ec99db489cbd136e Merge: 6cdd024 8661b4b Author: Damian Johnson Date: Mon Nov 23 18:29:19 2015 -0800 Fixes for tor's man page I'm adding Stem test coverage for tor's man page and in doing so ran into quite a few issues. All

[tor-commits] [tor/master] Replace 'SOCKSPort' with 'SocksPort'

2015-11-25 Thread nickm
commit 1193647ac81aaf37627c02b1653f5a9d7b5802fa Author: Damian Johnson Date: Mon Nov 23 17:32:49 2015 -0800 Replace 'SOCKSPort' with 'SocksPort' When applying changes from proposal 171 Nick renamed SocksPort to SOCKSPort, and SocksListenAddress to

[tor-commits] [tor/master] Rename RecommendedPackageVersions to RecommendedPackages

2015-11-25 Thread nickm
commit 961db64d3c106e5b8e370a2d8b2491344de6734a Author: Damian Johnson Date: Mon Nov 23 17:44:52 2015 -0800 Rename RecommendedPackageVersions to RecommendedPackages A 'RecommendedPackageVersions' option doesn't exist in tor. However, it *does* have

[tor-commits] [tor/master] Split 'slop' man page options to their own lines

2015-11-25 Thread nickm
commit feeb3e761cafe0c3a5c0c8be58df54f1cde2fcdb Author: Damian Johnson Date: Mon Nov 23 18:21:38 2015 -0800 Split 'slop' man page options to their own lines The slop testing options are the only spot where we try to enumerate multiple options on the

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/comments-20151123'

2015-11-25 Thread nickm
commit 45caeec9a03d7caca13ef4d6caeda23f7bb3129e Merge: ab1bc38 5b2adfb Author: Nick Mathewson Date: Wed Nov 25 09:08:15 2015 -0500 Merge remote-tracking branch 'teor/comments-20151123' src/common/crypto.c | 49 +++--

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

2015-11-25 Thread nickm
commit fe8eb9b366d9dccf06d8d4ce117b67bbb3aeba60 Merge: 45caeec dc0d2b5 Author: Nick Mathewson Date: Wed Nov 25 09:21:25 2015 -0500 Merge remote-tracking branch 'public/decouple_dir_request_failed' changes/bug17589 |7 +++ src/or/directory.c |5 + 2

[tor-commits] [tor/master] Don't relaunch dir requests recursively if connection_connect() returns -1

2015-11-25 Thread nickm
commit dc0d2b59706d036b97451dc1f8addc86ed783c2e Author: Nick Mathewson Date: Tue Nov 17 09:40:05 2015 -0500 Don't relaunch dir requests recursively if connection_connect() returns -1 Closes ticket 17589. --- changes/bug17589 |7 +++

[tor-commits] [tor/master] Include netinet/in.h (if detected) in check for net/pfvar.h

2015-11-25 Thread nickm
commit 232ccc18c40f0d0302b2e21b0f67885c548f8e63 Author: Nick Mathewson Date: Wed Nov 25 09:27:52 2015 -0500 Include netinet/in.h (if detected) in check for net/pfvar.h Patch from rubiate; fixes bug 17551. --- changes/bug17551 |4 configure.ac |

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

2015-11-25 Thread nickm
commit 62aad9c0b6812d04cfca3ec9e104d8ee2cbebb7c Merge: fe8eb9b 232ccc1 Author: Nick Mathewson Date: Wed Nov 25 09:28:44 2015 -0500 Merge branch 'maint-0.2.7' changes/bug17551 |4 configure.ac |3 +++ 2 files changed, 7 insertions(+)

[tor-commits] [tor/master] Initialize libevent before periodic events

2015-11-25 Thread nickm
commit c59c622d8590c4abed6b8095a7451e2ba4d9200a Author: cypherpunks Date: Wed Nov 25 15:20:07 2015 +0100 Initialize libevent before periodic events The initialization of libevent interferes with other tests so we also fork the circuit_timeout test.

[tor-commits] [tor/master] Attempt to make openbsd compilation happier with libevent2 installed

2015-11-25 Thread nickm
commit 5dff4ae0ad5e2a1fb93ceae3446f0a315fbd8a3a Author: Nick Mathewson Date: Wed Nov 25 09:43:12 2015 -0500 Attempt to make openbsd compilation happier with libevent2 installed Fix for bug 16651; patch from "rubiate". --- changes/bug16651 |5 +

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

2015-11-25 Thread translation
commit 44da95f133260ea78f18c2570eac9e993b9d3e23 Author: Translation commit bot Date: Wed Nov 25 14:45:03 2015 + Update translations for bridgedb --- th/LC_MESSAGES/bridgedb.po | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff