[tor-commits] [stem/master] Add query example to docs

2017-12-12 Thread atagar
commit f5480b36cbb26a7387e6e8324a34983a6211aeda Author: Damian Johnson Date: Tue Dec 12 11:50:39 2017 -0800 Add query example to docs Blogged an example of using this function when we added it... http://blog.atagar.com/august2017/ Handy

[tor-commits] [stem/master] Fix controller sphinx errors

2017-12-12 Thread atagar
commit a53ec0cddde92aab452664f3824fa3e9217ea50d Author: Damian Johnson Date: Tue Dec 12 11:57:57 2017 -0800 Fix controller sphinx errors Couple formatting errors that caused our docs to be malformed...

[tor-commits] [stem/master] Unused variable in example

2017-12-12 Thread atagar
commit 93d92a0307810dcc7ab1c7c640d19182e86cb06b Author: Damian Johnson Date: Tue Dec 12 09:54:09 2017 -0800 Unused variable in example Oops, forgot to remove this while fiddling with the example. --- docs/_static/example/words_with.py | 1 - 1 file changed,

[tor-commits] [tor/maint-0.3.2] Avoid crashing if we call num_usable_bridges() when bridges are not enabled

2017-12-12 Thread nickm
commit d7833c9d27feed9e4d4d4d4b5920b5d17150b82d Author: teor Date: Wed Nov 22 02:01:51 2017 +1100 Avoid crashing if we call num_usable_bridges() when bridges are not enabled This applies the changes in 23524 to num_usable_bridges(), because it has replaced

[tor-commits] [tor/maint-0.3.2] Make sure bridges are definitely running before delaying directory fetches

2017-12-12 Thread nickm
commit 19a4abf2a99c6a3de2c9a2fdf3e6d7b7c404f8f8 Author: teor Date: Mon Dec 11 02:29:05 2017 +1100 Make sure bridges are definitely running before delaying directory fetches Retry directory downloads when we get our first bridge descriptor during bootstrap

[tor-commits] [tor/maint-0.3.2] Run the download_status_increment test in a forked process.

2017-12-12 Thread nickm
commit 6f3a862966cd09b9feae357ada0ad4d51b51c0ea Author: Nick Mathewson Date: Fri Dec 1 16:06:25 2017 -0500 Run the download_status_increment test in a forked process. It messes with global state somehow in a way that makes several of the entryconn tests

[tor-commits] [tor/master] Stop checking cached bridge descriptors for usable bridges

2017-12-12 Thread nickm
commit 690f646bf8a5de9b099fb5295ba9ff252e5606f4 Author: teor Date: Wed Nov 22 01:50:46 2017 +1100 Stop checking cached bridge descriptors for usable bridges Stop checking for bridge descriptors when we actually want to know if any bridges are usable. This

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

2017-12-12 Thread nickm
commit bf89b089306067cffa4d2ca6b7fa7cd54790a961 Merge: cf5ab5934 19a4abf2a Author: Nick Mathewson Date: Tue Dec 12 19:17:38 2017 -0500 Merge branch 'bug24367_032_squashed' into maint-0.3.2 changes/bug24367 | 13 + src/or/bridges.c | 38

[tor-commits] [tor/maint-0.3.2] Simplify some conditionals in circuit_get_open_circ_or_launch()

2017-12-12 Thread nickm
commit 6b5c70670b26b9560febf5dc70f814d5e515c0f8 Author: teor Date: Mon Dec 11 01:14:28 2017 +1100 Simplify some conditionals in circuit_get_open_circ_or_launch() When entry_list_is_constrained() is true, guards_retry_optimistic() always returns true.

[tor-commits] [tor/master] Run the download_status_increment test in a forked process.

2017-12-12 Thread nickm
commit 6f3a862966cd09b9feae357ada0ad4d51b51c0ea Author: Nick Mathewson Date: Fri Dec 1 16:06:25 2017 -0500 Run the download_status_increment test in a forked process. It messes with global state somehow in a way that makes several of the entryconn tests

[tor-commits] [tor/maint-0.3.2] Stop checking cached bridge descriptors for usable bridges

2017-12-12 Thread nickm
commit 690f646bf8a5de9b099fb5295ba9ff252e5606f4 Author: teor Date: Wed Nov 22 01:50:46 2017 +1100 Stop checking cached bridge descriptors for usable bridges Stop checking for bridge descriptors when we actually want to know if any bridges are usable. This

[tor-commits] [tor/master] Avoid crashing if we call num_usable_bridges() when bridges are not enabled

2017-12-12 Thread nickm
commit d7833c9d27feed9e4d4d4d4b5920b5d17150b82d Author: teor Date: Wed Nov 22 02:01:51 2017 +1100 Avoid crashing if we call num_usable_bridges() when bridges are not enabled This applies the changes in 23524 to num_usable_bridges(), because it has replaced

[tor-commits] [tor/release-0.3.2] Stop checking cached bridge descriptors for usable bridges

2017-12-12 Thread nickm
commit 690f646bf8a5de9b099fb5295ba9ff252e5606f4 Author: teor Date: Wed Nov 22 01:50:46 2017 +1100 Stop checking cached bridge descriptors for usable bridges Stop checking for bridge descriptors when we actually want to know if any bridges are usable. This

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

2017-12-12 Thread nickm
commit dc9f2cdf73a4a55288f2321aa78b72ea188fedec Merge: dd5ca2505 bf89b0893 Author: Nick Mathewson Date: Tue Dec 12 19:27:14 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24367 | 13 + src/or/bridges.c | 38

[tor-commits] [tor/release-0.3.2] Avoid crashing if we call num_usable_bridges() when bridges are not enabled

2017-12-12 Thread nickm
commit d7833c9d27feed9e4d4d4d4b5920b5d17150b82d Author: teor Date: Wed Nov 22 02:01:51 2017 +1100 Avoid crashing if we call num_usable_bridges() when bridges are not enabled This applies the changes in 23524 to num_usable_bridges(), because it has replaced

[tor-commits] [tor/master] Simplify some conditionals in circuit_get_open_circ_or_launch()

2017-12-12 Thread nickm
commit 6b5c70670b26b9560febf5dc70f814d5e515c0f8 Author: teor Date: Mon Dec 11 01:14:28 2017 +1100 Simplify some conditionals in circuit_get_open_circ_or_launch() When entry_list_is_constrained() is true, guards_retry_optimistic() always returns true.

[tor-commits] [tor/master] Make sure bridges are definitely running before delaying directory fetches

2017-12-12 Thread nickm
commit 19a4abf2a99c6a3de2c9a2fdf3e6d7b7c404f8f8 Author: teor Date: Mon Dec 11 02:29:05 2017 +1100 Make sure bridges are definitely running before delaying directory fetches Retry directory downloads when we get our first bridge descriptor during bootstrap

[tor-commits] [tor/release-0.3.2] Make sure bridges are definitely running before delaying directory fetches

2017-12-12 Thread nickm
commit 19a4abf2a99c6a3de2c9a2fdf3e6d7b7c404f8f8 Author: teor Date: Mon Dec 11 02:29:05 2017 +1100 Make sure bridges are definitely running before delaying directory fetches Retry directory downloads when we get our first bridge descriptor during bootstrap

[tor-commits] [tor/release-0.3.2] Simplify some conditionals in circuit_get_open_circ_or_launch()

2017-12-12 Thread nickm
commit 6b5c70670b26b9560febf5dc70f814d5e515c0f8 Author: teor Date: Mon Dec 11 01:14:28 2017 +1100 Simplify some conditionals in circuit_get_open_circ_or_launch() When entry_list_is_constrained() is true, guards_retry_optimistic() always returns true.

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

2017-12-12 Thread nickm
commit bf89b089306067cffa4d2ca6b7fa7cd54790a961 Merge: cf5ab5934 19a4abf2a Author: Nick Mathewson Date: Tue Dec 12 19:17:38 2017 -0500 Merge branch 'bug24367_032_squashed' into maint-0.3.2 changes/bug24367 | 13 + src/or/bridges.c | 38

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

2017-12-12 Thread nickm
commit bf89b089306067cffa4d2ca6b7fa7cd54790a961 Merge: cf5ab5934 19a4abf2a Author: Nick Mathewson Date: Tue Dec 12 19:17:38 2017 -0500 Merge branch 'bug24367_032_squashed' into maint-0.3.2 changes/bug24367 | 13 + src/or/bridges.c | 38

[tor-commits] [tor/release-0.3.2] Run the download_status_increment test in a forked process.

2017-12-12 Thread nickm
commit 6f3a862966cd09b9feae357ada0ad4d51b51c0ea Author: Nick Mathewson Date: Fri Dec 1 16:06:25 2017 -0500 Run the download_status_increment test in a forked process. It messes with global state somehow in a way that makes several of the entryconn tests

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

2017-12-12 Thread nickm
commit 9abef516f609a619b25e8f53a413a2e3df05bde8 Merge: 13455c0f1 bf89b0893 Author: Nick Mathewson Date: Tue Dec 12 19:27:14 2017 -0500 Merge branch 'maint-0.3.2' changes/bug24367 | 13 + src/or/bridges.c | 38

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

2017-12-12 Thread nickm
commit 426110dfa2e27f134e7bf44341e5df6f454e49a3 Merge: 9abef516f 15b41fa6a Author: Nick Mathewson Date: Tue Dec 12 19:46:53 2017 -0500 Merge branch 'maint-0.3.2' changes/bug24424 | 3 +++ src/common/sandbox.c | 5 + 2 files changed, 8 insertions(+)

[tor-commits] [tor/release-0.3.2] Make sandbox.c compile when libseccomp-dev is installed on arm64

2017-12-12 Thread nickm
commit 15b41fa6ae6a1356d5453242ccb7d7d301dd5e67 Author: Nick Mathewson Date: Tue Dec 12 19:46:03 2017 -0500 Make sandbox.c compile when libseccomp-dev is installed on arm64 Fixes ticket 24424. Patch from weasel. --- changes/bug24424 | 3 +++

[tor-commits] [tor/maint-0.3.2] Make sandbox.c compile when libseccomp-dev is installed on arm64

2017-12-12 Thread nickm
commit 15b41fa6ae6a1356d5453242ccb7d7d301dd5e67 Author: Nick Mathewson Date: Tue Dec 12 19:46:03 2017 -0500 Make sandbox.c compile when libseccomp-dev is installed on arm64 Fixes ticket 24424. Patch from weasel. --- changes/bug24424 | 3 +++

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

2017-12-12 Thread nickm
commit 37fba82c155dda2ba5d4b3bdd63ea4cd54f264ee Merge: dc9f2cdf7 15b41fa6a Author: Nick Mathewson Date: Tue Dec 12 19:46:53 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24424 | 3 +++ src/common/sandbox.c | 5 + 2 files changed, 8

[tor-commits] [tor/master] Make sandbox.c compile when libseccomp-dev is installed on arm64

2017-12-12 Thread nickm
commit 15b41fa6ae6a1356d5453242ccb7d7d301dd5e67 Author: Nick Mathewson Date: Tue Dec 12 19:46:03 2017 -0500 Make sandbox.c compile when libseccomp-dev is installed on arm64 Fixes ticket 24424. Patch from weasel. --- changes/bug24424 | 3 +++

[tor-commits] [stem/master] Add multiprocessing to tutorials

2017-12-12 Thread atagar
commit c458fcf9fafa727b9fb5b722c9f0dec2152c756a Author: Damian Johnson Date: Tue Dec 12 11:48:43 2017 -0800 Add multiprocessing to tutorials Ooh, this is a good candidate for our tutorials. Very handy module. Blogged these examples a few months back...

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

2017-12-12 Thread nickm
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

2017-12-12 Thread nickm
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 'bug24167_025' into maint-0.2.5

2017-12-12 Thread nickm
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/master] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-12-12 Thread nickm
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] Fix a typo in CodingStandards.md

2017-12-12 Thread nickm
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

2017-12-12 Thread nickm
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 remote-tracking branch 'teor/doc24596'

2017-12-12 Thread nickm
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] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-12-12 Thread nickm
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'

2017-12-12 Thread nickm
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/maint-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-12 Thread nickm
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

2017-12-12 Thread nickm
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

2017-12-12 Thread nickm
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

2017-12-12 Thread nickm
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.0] rename changes file

2017-12-12 Thread nickm
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".

2017-12-12 Thread nickm
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

2017-12-12 Thread nickm
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.9] Fix a traceback when closing a blocked connection "immediately".

2017-12-12 Thread nickm
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".

2017-12-12 Thread nickm
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] Fix a traceback when closing a blocked connection "immediately".

2017-12-12 Thread nickm
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.3.0' into maint-0.3.1

2017-12-12 Thread nickm
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.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-12 Thread nickm
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

2017-12-12 Thread nickm
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 'bug24167_025' into maint-0.2.5

2017-12-12 Thread nickm
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".

2017-12-12 Thread nickm
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.5' into maint-0.2.8

2017-12-12 Thread nickm
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 'maint-0.2.9' into maint-0.3.0

2017-12-12 Thread nickm
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

2017-12-12 Thread nickm
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.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-12 Thread nickm
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

2017-12-12 Thread nickm
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

2017-12-12 Thread nickm
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.2] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-12 Thread nickm
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

2017-12-12 Thread nickm
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

2017-12-12 Thread nickm
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.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2017-12-12 Thread nickm
commit 4c54021baf4d22debc0381ae07edd911252dcd85 Merge: 4593f5a6e 31ce03a2b Author: Nick Mathewson Date: Tue Dec 12 09:13:12 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug23682 | 5 - 1 file changed, 5 deletions(-)

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

2017-12-12 Thread nickm
commit 31ce03a2b976966f8c4045f4a3e936b02b25352e Merge: cdee62da9 d3b7a2bd2 Author: Nick Mathewson Date: Tue Dec 12 09:13:12 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/{bug23682 => bug23862} | 0 1 file changed, 0 insertions(+), 0 deletions(-)

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

2017-12-12 Thread nickm
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 'maint-0.3.1' into maint-0.3.2

2017-12-12 Thread nickm
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/maint-0.3.2] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-12-12 Thread nickm
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

2017-12-12 Thread nickm
commit 31ce03a2b976966f8c4045f4a3e936b02b25352e Merge: cdee62da9 d3b7a2bd2 Author: Nick Mathewson Date: Tue Dec 12 09:13:12 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/{bug23682 => bug23862} | 0 1 file changed, 0 insertions(+), 0 deletions(-)

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

2017-12-12 Thread nickm
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/release-0.2.9] Fix a traceback when closing a blocked connection "immediately".

2017-12-12 Thread nickm
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/release-0.2.8] Merge branch 'bug24167_025' into maint-0.2.5

2017-12-12 Thread nickm
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/release-0.3.0] Merge branch 'bug24167_025' into maint-0.2.5

2017-12-12 Thread nickm
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/release-0.3.1] Fix a traceback when closing a blocked connection "immediately".

2017-12-12 Thread nickm
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/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

2017-12-12 Thread nickm
commit 5a8e902651001f20a00da7c78e69842ed13180c3 Merge: b077ccde4 f7151387d Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

2017-12-12 Thread nickm
commit 4c54021baf4d22debc0381ae07edd911252dcd85 Merge: 4593f5a6e 31ce03a2b Author: Nick Mathewson Date: Tue Dec 12 09:13:12 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug23682 | 5 - 1 file changed, 5 deletions(-)

[tor-commits] [tor/master] rename changes file

2017-12-12 Thread nickm
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/release-0.2.8] Fix a traceback when closing a blocked connection "immediately".

2017-12-12 Thread nickm
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.2] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-12-12 Thread nickm
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.2] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-12-12 Thread nickm
commit 31ce03a2b976966f8c4045f4a3e936b02b25352e Merge: cdee62da9 d3b7a2bd2 Author: Nick Mathewson Date: Tue Dec 12 09:13:12 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/{bug23682 => bug23862} | 0 1 file changed, 0 insertions(+), 0 deletions(-)

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

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

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

2017-12-12 Thread nickm
commit 644ec835d5a4ad140a4e4a79cd1a77ea43bcea58 Merge: 632d6cbc4 4c54021ba Author: Nick Mathewson Date: Tue Dec 12 09:13:12 2017 -0500 Merge branch 'maint-0.3.2' changes/bug23682 | 5 - 1 file changed, 5 deletions(-)

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

2017-12-12 Thread nickm
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/release-0.2.5] Fix a traceback when closing a blocked connection "immediately".

2017-12-12 Thread nickm
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/release-0.2.5] Merge branch 'bug24167_025' into maint-0.2.5

2017-12-12 Thread nickm
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/release-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-12 Thread nickm
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/release-0.3.1] rename changes file

2017-12-12 Thread nickm
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/release-0.3.2] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-12 Thread nickm
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/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-12-12 Thread nickm
commit 31ce03a2b976966f8c4045f4a3e936b02b25352e Merge: cdee62da9 d3b7a2bd2 Author: Nick Mathewson Date: Tue Dec 12 09:13:12 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/{bug23682 => bug23862} | 0 1 file changed, 0 insertions(+), 0 deletions(-)

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

2017-12-12 Thread nickm
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/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-12-12 Thread nickm
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/release-0.3.1] Merge branch 'bug24167_025' into maint-0.2.5

2017-12-12 Thread nickm
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/release-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-12 Thread nickm
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/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-12 Thread nickm
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/release-0.3.0] Fix a traceback when closing a blocked connection "immediately".

2017-12-12 Thread nickm
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/release-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-12 Thread nickm
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/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2017-12-12 Thread nickm
commit 06f1bb5954edd6c5cf7d7beb59e044f7f0dfbb9c Merge: 473725a63 eecfed0cd Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

2017-12-12 Thread nickm
commit ad3b01e056293b23160654d2e54c6d1ddf62242a Merge: e11830b2b da38904ef Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

2017-12-12 Thread nickm
commit 1ff7c60759d7d02fa0d029f4014e8b4e1b3cc368 Merge: ad3b01e05 d3b7a2bd2 Author: Nick Mathewson Date: Tue Dec 12 09:13:12 2017 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/{bug23682 => bug23862} | 0 1 file changed, 0 insertions(+), 0 deletions(-)

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

2017-12-12 Thread nickm
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/release-0.3.0] rename changes file

2017-12-12 Thread nickm
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

  1   2   >