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

commit 2cd49d9ea6f8bad20215ad17d5057a8eea8e39e8 Merge: 32eba3d 09ae4fc Author: Nick Mathewson Date: Tue Jun 27 18:28:34 2017 -0400 Merge branch 'ahf_bugs_22702_squashed' into maint-0.3.1 changes/bug22702 | 5 + src/or/consdiffmgr.c | 18 ++

[tor-commits] [tor/master] Set published_out for consensus cache entries in spooled_resource_estimate_size().

commit 07f2940b4519d801eb10b9f5e49790aced1f6322 Author: Alexander Færøy Date: Fri Jun 23 23:55:54 2017 + Set published_out for consensus cache entries in spooled_resource_estimate_size(). This patch ensures that the published_out output parameter is set to the

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

commit 2cd49d9ea6f8bad20215ad17d5057a8eea8e39e8 Merge: 32eba3d 09ae4fc Author: Nick Mathewson Date: Tue Jun 27 18:28:34 2017 -0400 Merge branch 'ahf_bugs_22702_squashed' into maint-0.3.1 changes/bug22702 | 5 + src/or/consdiffmgr.c | 18 ++

[tor-commits] [tor/release-0.3.1] Return "304 not modified" if a client already have the most recent consensus.

commit 0a4af86335f1f72982bbc7e57578f07630986999 Author: Alexander Færøy Date: Tue Jun 27 17:16:44 2017 + Return "304 not modified" if a client already have the most recent consensus. This makes our directory code check if a client is trying to fetch a

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

commit 2cd49d9ea6f8bad20215ad17d5057a8eea8e39e8 Merge: 32eba3d 09ae4fc Author: Nick Mathewson Date: Tue Jun 27 18:28:34 2017 -0400 Merge branch 'ahf_bugs_22702_squashed' into maint-0.3.1 changes/bug22702 | 5 + src/or/consdiffmgr.c | 18 ++

[tor-commits] [tor/maint-0.3.1] Add changes file for bug #22702.

commit 09ae4fc583daa8f1a4783a983ae0f5e3d743c2b2 Author: Alexander Færøy Date: Tue Jun 27 22:21:43 2017 + Add changes file for bug #22702. See: https://bugs.torproject.org/22702 --- changes/bug22702 | 5 + 1 file changed, 5 insertions(+) diff --git

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

commit 559195ea82bf1c0610898fd96cd5a835b2e4f9a7 Merge: 733ce55 2cd49d9 Author: Nick Mathewson Date: Tue Jun 27 18:28:38 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22702 | 5 + src/or/consdiffmgr.c | 18 ++ src/or/consdiffmgr.h | 3 +++

[tor-commits] [tor/release-0.3.1] Set published_out for consensus cache entries in spooled_resource_estimate_size().

commit 07f2940b4519d801eb10b9f5e49790aced1f6322 Author: Alexander Færøy Date: Fri Jun 23 23:55:54 2017 + Set published_out for consensus cache entries in spooled_resource_estimate_size(). This patch ensures that the published_out output parameter is set to the

[tor-commits] [tor/release-0.3.1] Add changes file for bug #22702.

commit 09ae4fc583daa8f1a4783a983ae0f5e3d743c2b2 Author: Alexander Færøy Date: Tue Jun 27 22:21:43 2017 + Add changes file for bug #22702. See: https://bugs.torproject.org/22702 --- changes/bug22702 | 5 + 1 file changed, 5 insertions(+) diff --git

[tor-commits] [tor/master] Add changes file for bug #22702.

commit 09ae4fc583daa8f1a4783a983ae0f5e3d743c2b2 Author: Alexander Færøy Date: Tue Jun 27 22:21:43 2017 + Add changes file for bug #22702. See: https://bugs.torproject.org/22702 --- changes/bug22702 | 5 + 1 file changed, 5 insertions(+) diff --git

[tor-commits] [tor/master] Return "304 not modified" if a client already have the most recent consensus.

commit 0a4af86335f1f72982bbc7e57578f07630986999 Author: Alexander Færøy Date: Tue Jun 27 17:16:44 2017 + Return "304 not modified" if a client already have the most recent consensus. This makes our directory code check if a client is trying to fetch a

[tor-commits] [tor/maint-0.3.1] Set published_out for consensus cache entries in spooled_resource_estimate_size().

commit 07f2940b4519d801eb10b9f5e49790aced1f6322 Author: Alexander Færøy Date: Fri Jun 23 23:55:54 2017 + Set published_out for consensus cache entries in spooled_resource_estimate_size(). This patch ensures that the published_out output parameter is set to the

[tor-commits] [tor/maint-0.3.1] Return "304 not modified" if a client already have the most recent consensus.

commit 0a4af86335f1f72982bbc7e57578f07630986999 Author: Alexander Færøy Date: Tue Jun 27 17:16:44 2017 + Return "304 not modified" if a client already have the most recent consensus. This makes our directory code check if a client is trying to fetch a

[tor-commits] [tor/master] no newlines in log messages.

commit 3f940415897ec905859314fe2bf129951cd54678 Author: Nick Mathewson Date: Tue Jun 27 18:21:35 2017 -0400 no newlines in log messages. --- src/common/crypto_ed25519.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

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

commit 733ce556ad6a59a111b63a860904799c30513a24 Merge: c0f0351 3f94041 Author: Nick Mathewson Date: Tue Jun 27 18:21:46 2017 -0400 Merge branch 'asn_bug22006_final_squashed' src/common/crypto_ed25519.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

[tor-commits] [tor/master] ed25519: Add unittests for ed25519 pubkey validation.

commit e8eee3a50e3c38b6c8e97d78a637b8a331fb6560 Author: George Kadianakis Date: Tue Apr 25 15:20:13 2017 +0300 ed25519: Add unittests for ed25519 pubkey validation. --- src/test/test_crypto.c | 66 ++ 1 file changed, 66

[tor-commits] [tor/master] ed25519: Dirauths validate router ed25519 pubkeys before pinning.

commit a155035d208fb2c05efdad22fe64ea2d6be929a1 Author: George Kadianakis Date: Tue Jun 27 15:53:00 2017 +0300 ed25519: Dirauths validate router ed25519 pubkeys before pinning. --- src/or/dirserv.c | 16 ++-- 1 file changed, 14 insertions(+), 2

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

commit 7fff6cfead76263c0ced736996dd7ed35e95a6f4 Merge: 0576f9f a155035 Author: Nick Mathewson Date: Tue Jun 27 17:19:08 2017 -0400 Merge branch 'asn_bug22006_final_squashed' changes/bug22006 | 4 ++ src/common/crypto_ed25519.c

[tor-commits] [tor/master] ed25519: Add python code to test our ed25519 validation.

commit 39b5dca7201bb3f30606be199f4d234c86fcaded Author: George Kadianakis Date: Mon Apr 24 16:22:02 2017 +0300 ed25519: Add python code to test our ed25519 validation. See https://lists.torproject.org/pipermail/tor-dev/2017-April/012213.html . ---

[tor-commits] [tor/master] ed25519: Add func that checks for torsion component in pubkeys.

commit 559658ff1ca1492543ad60d10b7101c70a62eaa2 Author: George Kadianakis Date: Tue Apr 25 15:19:41 2017 +0300 ed25519: Add func that checks for torsion component in pubkeys. See https://lists.torproject.org/pipermail/tor-dev/2017-April/012213.html . ---

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

commit c0f0351e06f30b81c77d853a7f90c55309b602bb Author: Nick Mathewson Date: Tue Jun 27 17:22:53 2017 -0400 whitespace fix --- src/test/test_crypto.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index

[tor-commits] [stem/master] Randomize BridgeDescriptor created fields

commit e5b7cbbccec5a4a238d386d927d5b8a66aad262b Author: Damian Johnson Date: Tue Jun 27 09:42:45 2017 -0700 Randomize BridgeDescriptor created fields These come from CollecTor. Can they even be signed? Regardless, randomizing their attributes. ---

[tor-commits] [stem/master] Raise NotImplementedError if signing not implemented

commit e4f1b57419f1e8ab87c54b65d9da8949e975dd95 Author: Damian Johnson Date: Tue Jun 27 09:23:30 2017 -0700 Raise NotImplementedError if signing not implemented We're documented as raising a NotImplementedError if signing isn't yet supported but we

[tor-commits] [stem/master] Note in comparison table that we now support descriptor creation

commit 785bbd36c187f56a9576c24c9158623f86a38ffd Author: Damian Johnson Date: Tue Jun 27 09:49:51 2017 -0700 Note in comparison table that we now support descriptor creation --- docs/tutorials/mirror_mirror_on_the_wall.rst | 6 +- 1 file changed, 1 insertion(+),

[tor-commits] [stem/master] Randomize created server descirptor fields

commit 25bf050edf71a7653970aa9ab41d70e4b4219b63 Author: Damian Johnson Date: Tue Jun 27 08:31:40 2017 -0700 Randomize created server descirptor fields Now that we're providing a method to create descriptors to callers (rather than just our own tests) we

[tor-commits] [metrics-lib/master] Rename 'DescripTor' to 'Tor Metrics Library' as part of task-22732.

commit 0d4898df6c74bb382253d7991621d9c08031ae8c Author: iwakeh Date: Mon Jun 26 20:12:13 2017 + Rename 'DescripTor' to 'Tor Metrics Library' as part of task-22732. --- build.xml| 4 ++-- src/main/resources/overview.html | 6 +++--- 2

[tor-commits] [metrics-web/master] Rename 'DescripTor' to 'Tor Metrics Library' as part of task-22732.

commit 1036ea84143da14adcd10b3f63b68e362d635a4e Author: iwakeh Date: Thu Jun 22 13:44:11 2017 + Rename 'DescripTor' to 'Tor Metrics Library' as part of task-22732. --- website/src/main/resources/web/WEB-INF/development.jsp | 2 +-

[tor-commits] [metrics-lib/master] All examples compile and work as explained in Metrics' web-site tutorials.

commit 27f05e1d4c67d8954b5cd2975781870a0dcdb9d9 Author: iwakeh Date: Mon Jun 26 20:12:11 2017 + All examples compile and work as explained in Metrics' web-site tutorials. Added a hint about where to find the examples to the README.md file. Implements

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

commit ccae991662adb3b64bdb1dcd4a942e4d1e163414 Merge: 325c507 d56f699 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 9a0fd2dbb187e898f63064c483776538a90562f1 Merge: 24ee859 3de2761 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 711160a46f5fbba7106c23c29f99bed75928a5a7 Merge: 1c64133 3483f7c Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit ccae991662adb3b64bdb1dcd4a942e4d1e163414 Merge: 325c507 d56f699 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/release-0.3.1] Fix an errant memset() into the middle of a struct in cell_pack().

commit 8d2978b13c7462776d8a6ba6a6df5b8d9883a633 Author: Nick Mathewson Date: Tue Jun 27 10:45:29 2017 -0400 Fix an errant memset() into the middle of a struct in cell_pack(). This mistake causes two possible bugs. I believe they are both harmless IRL.

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

commit a242d194c74b318b8ee4b347efd09ed13d0d2549 Merge: bdd267e 711160a Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit d56f6993990ab75b6ab8a80027ee60e610489a2c Merge: 104e8fa 8d2978b Author: Nick Mathewson Date: Tue Jun 27 11:04:41 2017 -0400 Merge branch 'bug22737_024' into maint-0.2.4 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit a242d194c74b318b8ee4b347efd09ed13d0d2549 Merge: bdd267e 711160a Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 3de27618e65affe3688a5d92bce96e1e4ed5a82a Merge: 3913f95 ccae991 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 3483f7c00349be6cba7b703f2e5ee94563d0c6eb Merge: 307be8d 9a0fd2d Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 3483f7c00349be6cba7b703f2e5ee94563d0c6eb Merge: 307be8d 9a0fd2d Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit d56f6993990ab75b6ab8a80027ee60e610489a2c Merge: 104e8fa 8d2978b Author: Nick Mathewson Date: Tue Jun 27 11:04:41 2017 -0400 Merge branch 'bug22737_024' into maint-0.2.4 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 48ff8bb49bc1cf3419bc9d62cd3dfd7d7cb12faa Merge: e23084b a242d19 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 711160a46f5fbba7106c23c29f99bed75928a5a7 Merge: 1c64133 3483f7c Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 9a0fd2dbb187e898f63064c483776538a90562f1 Merge: 24ee859 3de2761 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 0576f9f433f20af756bdaba6df5ac270d147e007 Merge: 22f441d 32eba3d Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files changed, 15

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

commit 3de27618e65affe3688a5d92bce96e1e4ed5a82a Merge: 3913f95 ccae991 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/release-0.3.0] Fix an errant memset() into the middle of a struct in cell_pack().

commit 8d2978b13c7462776d8a6ba6a6df5b8d9883a633 Author: Nick Mathewson Date: Tue Jun 27 10:45:29 2017 -0400 Fix an errant memset() into the middle of a struct in cell_pack(). This mistake causes two possible bugs. I believe they are both harmless IRL.

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

commit d56f6993990ab75b6ab8a80027ee60e610489a2c Merge: 104e8fa 8d2978b Author: Nick Mathewson Date: Tue Jun 27 11:04:41 2017 -0400 Merge branch 'bug22737_024' into maint-0.2.4 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit a242d194c74b318b8ee4b347efd09ed13d0d2549 Merge: bdd267e 711160a Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/master] Fix an errant memset() into the middle of a struct in cell_pack().

commit 8d2978b13c7462776d8a6ba6a6df5b8d9883a633 Author: Nick Mathewson Date: Tue Jun 27 10:45:29 2017 -0400 Fix an errant memset() into the middle of a struct in cell_pack(). This mistake causes two possible bugs. I believe they are both harmless IRL.

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

commit 32eba3d6aa7bd39048d32a566d119c013e526759 Merge: fd16dd2 a242d19 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit a242d194c74b318b8ee4b347efd09ed13d0d2549 Merge: bdd267e 711160a Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 9a0fd2dbb187e898f63064c483776538a90562f1 Merge: 24ee859 3de2761 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 711160a46f5fbba7106c23c29f99bed75928a5a7 Merge: 1c64133 3483f7c Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit a242d194c74b318b8ee4b347efd09ed13d0d2549 Merge: bdd267e 711160a Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 3483f7c00349be6cba7b703f2e5ee94563d0c6eb Merge: 307be8d 9a0fd2d Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit 9a0fd2dbb187e898f63064c483776538a90562f1 Merge: 24ee859 3de2761 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/maint-0.3.1] Fix an errant memset() into the middle of a struct in cell_pack().

commit 8d2978b13c7462776d8a6ba6a6df5b8d9883a633 Author: Nick Mathewson Date: Tue Jun 27 10:45:29 2017 -0400 Fix an errant memset() into the middle of a struct in cell_pack(). This mistake causes two possible bugs. I believe they are both harmless IRL.

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

commit ccae991662adb3b64bdb1dcd4a942e4d1e163414 Merge: 325c507 d56f699 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6

commit 3de27618e65affe3688a5d92bce96e1e4ed5a82a Merge: 3913f95 ccae991 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 711160a46f5fbba7106c23c29f99bed75928a5a7 Merge: 1c64133 3483f7c Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 32eba3d6aa7bd39048d32a566d119c013e526759 Merge: fd16dd2 a242d19 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit ccae991662adb3b64bdb1dcd4a942e4d1e163414 Merge: 325c507 d56f699 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 711160a46f5fbba7106c23c29f99bed75928a5a7 Merge: 1c64133 3483f7c Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 3483f7c00349be6cba7b703f2e5ee94563d0c6eb Merge: 307be8d 9a0fd2d Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 3de27618e65affe3688a5d92bce96e1e4ed5a82a Merge: 3913f95 ccae991 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/master] Merge branch 'bug22737_024' into maint-0.2.4

commit d56f6993990ab75b6ab8a80027ee60e610489a2c Merge: 104e8fa 8d2978b Author: Nick Mathewson Date: Tue Jun 27 11:04:41 2017 -0400 Merge branch 'bug22737_024' into maint-0.2.4 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit ccae991662adb3b64bdb1dcd4a942e4d1e163414 Merge: 325c507 d56f699 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit d56f6993990ab75b6ab8a80027ee60e610489a2c Merge: 104e8fa 8d2978b Author: Nick Mathewson Date: Tue Jun 27 11:04:41 2017 -0400 Merge branch 'bug22737_024' into maint-0.2.4 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 3de27618e65affe3688a5d92bce96e1e4ed5a82a Merge: 3913f95 ccae991 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 3483f7c00349be6cba7b703f2e5ee94563d0c6eb Merge: 307be8d 9a0fd2d Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/maint-0.3.0] Fix an errant memset() into the middle of a struct in cell_pack().

commit 8d2978b13c7462776d8a6ba6a6df5b8d9883a633 Author: Nick Mathewson Date: Tue Jun 27 10:45:29 2017 -0400 Fix an errant memset() into the middle of a struct in cell_pack(). This mistake causes two possible bugs. I believe they are both harmless IRL.

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit 9a0fd2dbb187e898f63064c483776538a90562f1 Merge: 24ee859 3de2761 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 711160a46f5fbba7106c23c29f99bed75928a5a7 Merge: 1c64133 3483f7c Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 3de27618e65affe3688a5d92bce96e1e4ed5a82a Merge: 3913f95 ccae991 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit cd47dfdb47eb138587cac7343a63e8c98f54b907 Merge: 78988f1 711160a Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit d56f6993990ab75b6ab8a80027ee60e610489a2c Merge: 104e8fa 8d2978b Author: Nick Mathewson Date: Tue Jun 27 11:04:41 2017 -0400 Merge branch 'bug22737_024' into maint-0.2.4 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 9a0fd2dbb187e898f63064c483776538a90562f1 Merge: 24ee859 3de2761 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit ccae991662adb3b64bdb1dcd4a942e4d1e163414 Merge: 325c507 d56f699 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/release-0.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

commit 9a0fd2dbb187e898f63064c483776538a90562f1 Merge: 24ee859 3de2761 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/release-0.2.8] Fix an errant memset() into the middle of a struct in cell_pack().

commit 8d2978b13c7462776d8a6ba6a6df5b8d9883a633 Author: Nick Mathewson Date: Tue Jun 27 10:45:29 2017 -0400 Fix an errant memset() into the middle of a struct in cell_pack(). This mistake causes two possible bugs. I believe they are both harmless IRL.

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

commit 3483f7c00349be6cba7b703f2e5ee94563d0c6eb Merge: 307be8d 9a0fd2d Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 3de27618e65affe3688a5d92bce96e1e4ed5a82a Merge: 3913f95 ccae991 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 9a0fd2dbb187e898f63064c483776538a90562f1 Merge: 24ee859 3de2761 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 963324cf2accfc424df5fde902299449abf9093c Merge: f7503fb 3483f7c Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/release-0.2.7-redux] Merge branch 'maint-0.2.5' into maint-0.2.6

commit 3de27618e65affe3688a5d92bce96e1e4ed5a82a Merge: 3913f95 ccae991 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 3de27618e65affe3688a5d92bce96e1e4ed5a82a Merge: 3913f95 ccae991 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 1fd9d5ef37943a3c4688b113972bb7f6d44dbb7f Merge: eb4ca1c 3de2761 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.6' into release-0.2.6 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit ccae991662adb3b64bdb1dcd4a942e4d1e163414 Merge: 325c507 d56f699 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/release-0.2.7-redux] Merge branch 'maint-0.2.4' into maint-0.2.5

commit ccae991662adb3b64bdb1dcd4a942e4d1e163414 Merge: 325c507 d56f699 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit a8fcb6aa1a9f60d8335c2c9d775a61e61b2cc278 Merge: 37dabc0 9a0fd2d Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2

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

commit 3483f7c00349be6cba7b703f2e5ee94563d0c6eb Merge: 307be8d 9a0fd2d Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/release-0.2.6] Merge branch 'bug22737_024' into maint-0.2.4

commit d56f6993990ab75b6ab8a80027ee60e610489a2c Merge: 104e8fa 8d2978b Author: Nick Mathewson Date: Tue Jun 27 11:04:41 2017 -0400 Merge branch 'bug22737_024' into maint-0.2.4 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/release-0.2.6] Fix an errant memset() into the middle of a struct in cell_pack().

commit 8d2978b13c7462776d8a6ba6a6df5b8d9883a633 Author: Nick Mathewson Date: Tue Jun 27 10:45:29 2017 -0400 Fix an errant memset() into the middle of a struct in cell_pack(). This mistake causes two possible bugs. I believe they are both harmless IRL.

[tor-commits] [tor/release-0.2.9] Fix an errant memset() into the middle of a struct in cell_pack().

commit 8d2978b13c7462776d8a6ba6a6df5b8d9883a633 Author: Nick Mathewson Date: Tue Jun 27 10:45:29 2017 -0400 Fix an errant memset() into the middle of a struct in cell_pack(). This mistake causes two possible bugs. I believe they are both harmless IRL.

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

commit d56f6993990ab75b6ab8a80027ee60e610489a2c Merge: 104e8fa 8d2978b Author: Nick Mathewson Date: Tue Jun 27 11:04:41 2017 -0400 Merge branch 'bug22737_024' into maint-0.2.4 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/release-0.2.7-redux] Fix an errant memset() into the middle of a struct in cell_pack().

commit 8d2978b13c7462776d8a6ba6a6df5b8d9883a633 Author: Nick Mathewson Date: Tue Jun 27 10:45:29 2017 -0400 Fix an errant memset() into the middle of a struct in cell_pack(). This mistake causes two possible bugs. I believe they are both harmless IRL.

[tor-commits] [tor/release-0.2.7-redux] Merge branch 'bug22737_024' into maint-0.2.4

commit d56f6993990ab75b6ab8a80027ee60e610489a2c Merge: 104e8fa 8d2978b Author: Nick Mathewson Date: Tue Jun 27 11:04:41 2017 -0400 Merge branch 'bug22737_024' into maint-0.2.4 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5

commit ccae991662adb3b64bdb1dcd4a942e4d1e163414 Merge: 325c507 d56f699 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit e6d77520ef99c2f0d576f0314d3f86322e16b3af Merge: c1195d4 ccae991 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

[tor-commits] [tor/release-0.2.4] Fix an errant memset() into the middle of a struct in cell_pack().

commit 8d2978b13c7462776d8a6ba6a6df5b8d9883a633 Author: Nick Mathewson Date: Tue Jun 27 10:45:29 2017 -0400 Fix an errant memset() into the middle of a struct in cell_pack(). This mistake causes two possible bugs. I believe they are both harmless IRL.

  1   2   >