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

commit f7151387d937bd1113f4c694b170305d80dde9fa Merge: bc1ea4f47 1deda2106 Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

[tor-commits] [tor/maint-0.3.1] rename changes file

commit d3b7a2bd275842e9826946428d25fc5b72153f7c Author: Nick Mathewson Date: Tue Dec 12 09:13:05 2017 -0500 rename changes file --- changes/{bug23682 => bug23862} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/changes/bug23682 b/changes/bug23862

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

commit 1deda2106b0af16daaecc2e27982a28054e28345 Merge: f5d4bdf30 95238eb91 Author: Nick Mathewson Date: Mon Dec 11 16:56:28 2017 -0500 Merge branch 'bug24167_025' into maint-0.2.5 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit da38904efbdd0c2c6b754aed7f75201e3c1cd97a Merge: 2ea573ece eecfed0cd Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit eecfed0cd2c8c92175106e211d1662fa43fc60bc Merge: eaaa1108a f7151387d Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit cdee62da9e06dfc91a3100248bd9b8e82345347f Merge: 04524443d da38904ef Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

[tor-commits] [tor/maint-0.3.0] Fix a traceback when closing a blocked connection "immediately".

commit 95238eb9174f0cfee9d313ce15b4f9b471f3d0e5 Author: Nick Mathewson Date: Thu Nov 16 11:45:15 2017 -0500 Fix a traceback when closing a blocked connection "immediately". When we close a connection via connection_close_immediately, we kill its events

[tor-commits] [tor/maint-0.2.9] Fix a traceback when closing a blocked connection "immediately".

commit 95238eb9174f0cfee9d313ce15b4f9b471f3d0e5 Author: Nick Mathewson Date: Thu Nov 16 11:45:15 2017 -0500 Fix a traceback when closing a blocked connection "immediately". When we close a connection via connection_close_immediately, we kill its events

[tor-commits] [tor/maint-0.3.1] Fix a traceback when closing a blocked connection "immediately".

commit 95238eb9174f0cfee9d313ce15b4f9b471f3d0e5 Author: Nick Mathewson Date: Thu Nov 16 11:45:15 2017 -0500 Fix a traceback when closing a blocked connection "immediately". When we close a connection via connection_close_immediately, we kill its events

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

commit da38904efbdd0c2c6b754aed7f75201e3c1cd97a Merge: 2ea573ece eecfed0cd Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit eecfed0cd2c8c92175106e211d1662fa43fc60bc Merge: eaaa1108a f7151387d Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit 1deda2106b0af16daaecc2e27982a28054e28345 Merge: f5d4bdf30 95238eb91 Author: Nick Mathewson Date: Mon Dec 11 16:56:28 2017 -0500 Merge branch 'bug24167_025' into maint-0.2.5 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

[tor-commits] [tor/maint-0.3.0] rename changes file

commit d3b7a2bd275842e9826946428d25fc5b72153f7c Author: Nick Mathewson Date: Tue Dec 12 09:13:05 2017 -0500 rename changes file --- changes/{bug23682 => bug23862} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/changes/bug23682 b/changes/bug23862

[tor-commits] [tor/maint-0.2.5] Fix a traceback when closing a blocked connection "immediately".

commit 95238eb9174f0cfee9d313ce15b4f9b471f3d0e5 Author: Nick Mathewson Date: Thu Nov 16 11:45:15 2017 -0500 Fix a traceback when closing a blocked connection "immediately". When we close a connection via connection_close_immediately, we kill its events

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

commit f7151387d937bd1113f4c694b170305d80dde9fa Merge: bc1ea4f47 1deda2106 Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit f7151387d937bd1113f4c694b170305d80dde9fa Merge: bc1ea4f47 1deda2106 Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit 1deda2106b0af16daaecc2e27982a28054e28345 Merge: f5d4bdf30 95238eb91 Author: Nick Mathewson Date: Mon Dec 11 16:56:28 2017 -0500 Merge branch 'bug24167_025' into maint-0.2.5 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit f7151387d937bd1113f4c694b170305d80dde9fa Merge: bc1ea4f47 1deda2106 Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit 1deda2106b0af16daaecc2e27982a28054e28345 Merge: f5d4bdf30 95238eb91 Author: Nick Mathewson Date: Mon Dec 11 16:56:28 2017 -0500 Merge branch 'bug24167_025' into maint-0.2.5 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

[tor-commits] [tor/maint-0.2.8] Fix a traceback when closing a blocked connection "immediately".

commit 95238eb9174f0cfee9d313ce15b4f9b471f3d0e5 Author: Nick Mathewson Date: Thu Nov 16 11:45:15 2017 -0500 Fix a traceback when closing a blocked connection "immediately". When we close a connection via connection_close_immediately, we kill its events

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

commit f7151387d937bd1113f4c694b170305d80dde9fa Merge: bc1ea4f47 1deda2106 Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit 1deda2106b0af16daaecc2e27982a28054e28345 Merge: f5d4bdf30 95238eb91 Author: Nick Mathewson Date: Mon Dec 11 16:56:28 2017 -0500 Merge branch 'bug24167_025' into maint-0.2.5 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit 1deda2106b0af16daaecc2e27982a28054e28345 Merge: f5d4bdf30 95238eb91 Author: Nick Mathewson Date: Mon Dec 11 16:56:28 2017 -0500 Merge branch 'bug24167_025' into maint-0.2.5 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit eecfed0cd2c8c92175106e211d1662fa43fc60bc Merge: eaaa1108a f7151387d Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit cdee62da9e06dfc91a3100248bd9b8e82345347f Merge: 04524443d da38904ef Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit a6587e9070e17f44025be1d312e1fb628cbfa3f3 Merge: 422ff8f92 4593f5a6e Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.3.2' ___ tor-commits mailing list

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

commit 632d6cbc430eb1d5d764321fb2a6e6c27fe849e3 Merge: a6587e907 7b5919966 Author: Nick Mathewson Date: Tue Dec 12 09:07:49 2017 -0500 Merge remote-tracking branch 'teor/doc24596' doc/HACKING/CodingStandards.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] Fix a typo in CodingStandards.md

commit 7b591996636052dc6d58ff8bd78b48fd3394115a Author: teor Date: Tue Dec 12 12:32:14 2017 +1100 Fix a typo in CodingStandards.md Closes #24596. --- doc/HACKING/CodingStandards.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

commit 4593f5a6e12132be4ac97d7a93675d1a04fa4b29 Merge: 43fb8fc5c cdee62da9 Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 ___ tor-commits mailing list

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

commit da38904efbdd0c2c6b754aed7f75201e3c1cd97a Merge: 2ea573ece eecfed0cd Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit f7151387d937bd1113f4c694b170305d80dde9fa Merge: bc1ea4f47 1deda2106 Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit eecfed0cd2c8c92175106e211d1662fa43fc60bc Merge: eaaa1108a f7151387d Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit 1deda2106b0af16daaecc2e27982a28054e28345 Merge: f5d4bdf30 95238eb91 Author: Nick Mathewson Date: Mon Dec 11 16:56:28 2017 -0500 Merge branch 'bug24167_025' into maint-0.2.5 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

<    1   2