[tor-commits] [webwml/master] Revert "Drop broken TorBrowser link"

2017-02-07 Thread arma
commit 6f83149ceea0fa621529d403c1d1390c2fc257a5 Author: Roger Dingledine Date: Tue Feb 7 21:18:08 2017 -0500 Revert "Drop broken TorBrowser link" This reverts commit dfca2029f35e01297434d5ba288f89cc312948f2. --- getinvolved/en/volunteer.wml | 2 +- 1 file changed, 1 insertion(+),

[tor-commits] [webwml/master] fix a very subtle html breakage

2017-02-07 Thread arma
commit 5bb684790a110fdaad4731cd03382c1d024f91e4 Author: Roger Dingledine Date: Tue Feb 7 21:16:51 2017 -0500 fix a very subtle html breakage introduced in commit d886c1470 this breakage was also the reason why commit dfca2029 happened (which i'll revert next). --- get

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

2017-02-07 Thread nickm
commit c056d19323e499a0003ba9de0db2bdee9c301872 Merge: b9ef21c 85a2487 Author: Nick Mathewson Date: Tue Feb 7 10:37:31 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug16248 | 8 src/or/main.c| 55 +++ 2 fi

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

2017-02-07 Thread nickm
commit eca4a89319c566c0e320c7f713aed0f7e34330eb Merge: a9f936d 4bce207 Author: Nick Mathewson Date: Tue Feb 7 10:39:13 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list tor-commits@lists.torproject.org https:/

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

2017-02-07 Thread nickm
commit 4bce2072acaca38d40086c943d8f332ed2c2cf50 Merge: 86d5a6f f2a3041 Author: Nick Mathewson Date: Tue Feb 7 10:39:03 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) ___

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

2017-02-07 Thread nickm
commit eca4a89319c566c0e320c7f713aed0f7e34330eb Merge: a9f936d 4bce207 Author: Nick Mathewson Date: Tue Feb 7 10:39:13 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list tor-commits@lists.torproject.org https:/

[tor-commits] [tor/release-0.2.9] Add comments to connection_check_event().

2017-02-07 Thread nickm
commit cfeb1db2fb881db85a11d80e70a1a14c62b46950 Author: Nick Mathewson Date: Mon Mar 14 12:53:21 2016 -0400 Add comments to connection_check_event(). --- src/or/main.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 1200b55..89e5a51 10064

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

2017-02-07 Thread nickm
commit 23f1caf2af300c55a33b7cb3f1671b0b9c2f73f2 Merge: 65cda78 eca4a89 Author: Nick Mathewson Date: Tue Feb 7 10:39:23 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list tor-commits@lists.torproject.org https:/

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

2017-02-07 Thread nickm
commit 788a05a50fd0b93be891dc6226ed8f95fa7e96b1 Merge: 4f1fcaa 23f1caf Author: Nick Mathewson Date: Tue Feb 7 10:39:58 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 ___ tor-commits mailing list tor-commits@lists.torproject.org https://

[tor-commits] [tor/release-0.2.4] Change behavior on missing/present event to warn instead of asserting.

2017-02-07 Thread nickm
commit 457d38a6e9212de3a5cab24fc59829c689f88560 Author: Nick Mathewson Date: Fri Mar 11 10:50:36 2016 -0500 Change behavior on missing/present event to warn instead of asserting. Add a changes file. --- changes/bug16248 | 8 src/or/main.c| 49

[tor-commits] [tor/release-0.2.7] Add comments to connection_check_event().

2017-02-07 Thread nickm
commit cfeb1db2fb881db85a11d80e70a1a14c62b46950 Author: Nick Mathewson Date: Mon Mar 14 12:53:21 2016 -0400 Add comments to connection_check_event(). --- src/or/main.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 1200b55..89e5a51 10064

[tor-commits] [tor/release-0.2.8] Add comments to connection_check_event().

2017-02-07 Thread nickm
commit cfeb1db2fb881db85a11d80e70a1a14c62b46950 Author: Nick Mathewson Date: Mon Mar 14 12:53:21 2016 -0400 Add comments to connection_check_event(). --- src/or/main.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 1200b55..89e5a51 10064

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

2017-02-07 Thread nickm
commit 26ea56a6c2deaadd3031e9efde928a28120c1647 Merge: 6cfbaed 4bce207 Author: Nick Mathewson Date: Tue Feb 7 10:39:54 2017 -0500 Merge branch 'maint-0.2.7' into release-0.2.7 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) ___

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

2017-02-07 Thread nickm
commit 1243c1000cdcfd4edf414ff8a14e34ea15aa2cef Merge: 5f84409 eca4a89 Author: Nick Mathewson Date: Tue Feb 7 10:39:56 2017 -0500 Merge branch 'maint-0.2.8' into release-0.2.8 ___ tor-commits mailing list tor-commits@lists.torproject.org https://

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

2017-02-07 Thread nickm
commit c056d19323e499a0003ba9de0db2bdee9c301872 Merge: b9ef21c 85a2487 Author: Nick Mathewson Date: Tue Feb 7 10:37:31 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug16248 | 8 src/or/main.c| 55 +++ 2 fi

[tor-commits] [tor/release-0.2.9] Change behavior on missing/present event to warn instead of asserting.

2017-02-07 Thread nickm
commit 457d38a6e9212de3a5cab24fc59829c689f88560 Author: Nick Mathewson Date: Fri Mar 11 10:50:36 2016 -0500 Change behavior on missing/present event to warn instead of asserting. Add a changes file. --- changes/bug16248 | 8 src/or/main.c| 49

[tor-commits] [tor/release-0.2.8] Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix

2017-02-07 Thread nickm
commit 85a2487f9704cfeff0255c5f660d977ec9c30cff Author: Nick Mathewson Date: Tue Feb 7 09:49:23 2017 -0500 Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix --- src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c in

[tor-commits] [tor/release-0.2.8] Change behavior on missing/present event to warn instead of asserting.

2017-02-07 Thread nickm
commit 457d38a6e9212de3a5cab24fc59829c689f88560 Author: Nick Mathewson Date: Fri Mar 11 10:50:36 2016 -0500 Change behavior on missing/present event to warn instead of asserting. Add a changes file. --- changes/bug16248 | 8 src/or/main.c| 49

[tor-commits] [tor/release-0.2.8] If we start/stop reading on a dnsserv connection, don't assert.

2017-02-07 Thread nickm
commit 650c03127a877eb0de1cfad8afa5cb3d8474a956 Author: Nick Mathewson Date: Fri Mar 11 10:33:19 2016 -0500 If we start/stop reading on a dnsserv connection, don't assert. Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha. --- src/or/main.c | 12 1 fil

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

2017-02-07 Thread nickm
commit f2a30413a35bb360323a98fb124fbc629245978d Merge: 5446cb8 2ce4330 Author: Nick Mathewson Date: Tue Feb 7 10:37:53 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug16248 | 8 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- src/or/main.c| 55 +++

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

2017-02-07 Thread nickm
commit 0c18b2dc769413dd6a2293fd598cd405dc8a6e82 Merge: f9be4b9 f2a3041 Author: Nick Mathewson Date: Tue Feb 7 10:39:52 2017 -0500 Merge branch 'maint-0.2.6' into release-0.2.6 changes/bug16248 | 8 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- src/or/main.c| 55 +

[tor-commits] [tor/release-0.2.8] Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5

2017-02-07 Thread nickm
commit 2ce43302490ac916be4188bff70f70958aee1790 Merge: c056d19 0ca3f49 Author: Nick Mathewson Date: Tue Feb 7 10:37:43 2017 -0500 Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3

[tor-commits] [tor/release-0.2.6] Add comments to connection_check_event().

2017-02-07 Thread nickm
commit cfeb1db2fb881db85a11d80e70a1a14c62b46950 Author: Nick Mathewson Date: Mon Mar 14 12:53:21 2016 -0400 Add comments to connection_check_event(). --- src/or/main.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 1200b55..89e5a51 10064

[tor-commits] [tor/maint-0.2.4] Change behavior on missing/present event to warn instead of asserting.

2017-02-07 Thread nickm
commit 457d38a6e9212de3a5cab24fc59829c689f88560 Author: Nick Mathewson Date: Fri Mar 11 10:50:36 2016 -0500 Change behavior on missing/present event to warn instead of asserting. Add a changes file. --- changes/bug16248 | 8 src/or/main.c| 49

[tor-commits] [tor/maint-0.2.6] Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5

2017-02-07 Thread nickm
commit 2ce43302490ac916be4188bff70f70958aee1790 Merge: c056d19 0ca3f49 Author: Nick Mathewson Date: Tue Feb 7 10:37:43 2017 -0500 Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3

[tor-commits] [tor/maint-0.2.5] Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5

2017-02-07 Thread nickm
commit 2ce43302490ac916be4188bff70f70958aee1790 Merge: c056d19 0ca3f49 Author: Nick Mathewson Date: Tue Feb 7 10:37:43 2017 -0500 Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3

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

2017-02-07 Thread nickm
commit c056d19323e499a0003ba9de0db2bdee9c301872 Merge: b9ef21c 85a2487 Author: Nick Mathewson Date: Tue Feb 7 10:37:31 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug16248 | 8 src/or/main.c| 55 +++ 2 fi

[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5

2017-02-07 Thread nickm
commit 2ce43302490ac916be4188bff70f70958aee1790 Merge: c056d19 0ca3f49 Author: Nick Mathewson Date: Tue Feb 7 10:37:43 2017 -0500 Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3

[tor-commits] [tor/release-0.2.9] If we start/stop reading on a dnsserv connection, don't assert.

2017-02-07 Thread nickm
commit 650c03127a877eb0de1cfad8afa5cb3d8474a956 Author: Nick Mathewson Date: Fri Mar 11 10:33:19 2016 -0500 If we start/stop reading on a dnsserv connection, don't assert. Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha. --- src/or/main.c | 12 1 fil

[tor-commits] [tor/release-0.2.9] Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix

2017-02-07 Thread nickm
commit 85a2487f9704cfeff0255c5f660d977ec9c30cff Author: Nick Mathewson Date: Tue Feb 7 09:49:23 2017 -0500 Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix --- src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c in

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

2017-02-07 Thread nickm
commit 4bce2072acaca38d40086c943d8f332ed2c2cf50 Merge: 86d5a6f f2a3041 Author: Nick Mathewson Date: Tue Feb 7 10:39:03 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) ___

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

2017-02-07 Thread nickm
commit f2a30413a35bb360323a98fb124fbc629245978d Merge: 5446cb8 2ce4330 Author: Nick Mathewson Date: Tue Feb 7 10:37:53 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug16248 | 8 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- src/or/main.c| 55 +++

[tor-commits] [tor/release-0.2.7] Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix

2017-02-07 Thread nickm
commit 85a2487f9704cfeff0255c5f660d977ec9c30cff Author: Nick Mathewson Date: Tue Feb 7 09:49:23 2017 -0500 Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix --- src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c in

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

2017-02-07 Thread nickm
commit 4bce2072acaca38d40086c943d8f332ed2c2cf50 Merge: 86d5a6f f2a3041 Author: Nick Mathewson Date: Tue Feb 7 10:39:03 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) ___

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

2017-02-07 Thread nickm
commit f2a30413a35bb360323a98fb124fbc629245978d Merge: 5446cb8 2ce4330 Author: Nick Mathewson Date: Tue Feb 7 10:37:53 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug16248 | 8 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- src/or/main.c| 55 +++

[tor-commits] [tor/release-0.2.7] Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5

2017-02-07 Thread nickm
commit 2ce43302490ac916be4188bff70f70958aee1790 Merge: c056d19 0ca3f49 Author: Nick Mathewson Date: Tue Feb 7 10:37:43 2017 -0500 Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3

[tor-commits] [tor/release-0.2.7] If we start/stop reading on a dnsserv connection, don't assert.

2017-02-07 Thread nickm
commit 650c03127a877eb0de1cfad8afa5cb3d8474a956 Author: Nick Mathewson Date: Fri Mar 11 10:33:19 2016 -0500 If we start/stop reading on a dnsserv connection, don't assert. Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha. --- src/or/main.c | 12 1 fil

[tor-commits] [tor/release-0.2.7] Fix dnsserv.c assertion when no supported questions are requested.

2017-02-07 Thread nickm
commit 0ca3f495c6fad074606ab75942b64738ed61926a Author: Scott Dial Date: Wed May 4 14:45:09 2016 -0400 Fix dnsserv.c assertion when no supported questions are requested. The problem is that "q" is always set on the first iteration even if the question is not a supported questio

[tor-commits] [tor/release-0.2.7] Change behavior on missing/present event to warn instead of asserting.

2017-02-07 Thread nickm
commit 457d38a6e9212de3a5cab24fc59829c689f88560 Author: Nick Mathewson Date: Fri Mar 11 10:50:36 2016 -0500 Change behavior on missing/present event to warn instead of asserting. Add a changes file. --- changes/bug16248 | 8 src/or/main.c| 49

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

2017-02-07 Thread nickm
commit c056d19323e499a0003ba9de0db2bdee9c301872 Merge: b9ef21c 85a2487 Author: Nick Mathewson Date: Tue Feb 7 10:37:31 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug16248 | 8 src/or/main.c| 55 +++ 2 fi

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5

2017-02-07 Thread nickm
commit 2ce43302490ac916be4188bff70f70958aee1790 Merge: c056d19 0ca3f49 Author: Nick Mathewson Date: Tue Feb 7 10:37:43 2017 -0500 Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3

[tor-commits] [tor/release-0.2.6] Fix dnsserv.c assertion when no supported questions are requested.

2017-02-07 Thread nickm
commit 0ca3f495c6fad074606ab75942b64738ed61926a Author: Scott Dial Date: Wed May 4 14:45:09 2016 -0400 Fix dnsserv.c assertion when no supported questions are requested. The problem is that "q" is always set on the first iteration even if the question is not a supported questio

[tor-commits] [tor/release-0.2.4] If we start/stop reading on a dnsserv connection, don't assert.

2017-02-07 Thread nickm
commit 650c03127a877eb0de1cfad8afa5cb3d8474a956 Author: Nick Mathewson Date: Fri Mar 11 10:33:19 2016 -0500 If we start/stop reading on a dnsserv connection, don't assert. Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha. --- src/or/main.c | 12 1 fil

[tor-commits] [tor/release-0.2.4] Add comments to connection_check_event().

2017-02-07 Thread nickm
commit cfeb1db2fb881db85a11d80e70a1a14c62b46950 Author: Nick Mathewson Date: Mon Mar 14 12:53:21 2016 -0400 Add comments to connection_check_event(). --- src/or/main.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 1200b55..89e5a51 10064

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

2017-02-07 Thread nickm
commit 8bcc14f62e620c4a15084449c335680096511001 Merge: 9c5ff56 85a2487 Author: Nick Mathewson Date: Tue Feb 7 10:39:48 2017 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug16248 | 8 src/or/main.c| 55 +++ 2

[tor-commits] [tor/release-0.2.5] Add comments to connection_check_event().

2017-02-07 Thread nickm
commit cfeb1db2fb881db85a11d80e70a1a14c62b46950 Author: Nick Mathewson Date: Mon Mar 14 12:53:21 2016 -0400 Add comments to connection_check_event(). --- src/or/main.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 1200b55..89e5a51 10064

[tor-commits] [tor/release-0.2.5] Fix dnsserv.c assertion when no supported questions are requested.

2017-02-07 Thread nickm
commit 0ca3f495c6fad074606ab75942b64738ed61926a Author: Scott Dial Date: Wed May 4 14:45:09 2016 -0400 Fix dnsserv.c assertion when no supported questions are requested. The problem is that "q" is always set on the first iteration even if the question is not a supported questio

[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5

2017-02-07 Thread nickm
commit 2ce43302490ac916be4188bff70f70958aee1790 Merge: c056d19 0ca3f49 Author: Nick Mathewson Date: Tue Feb 7 10:37:43 2017 -0500 Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3

[tor-commits] [tor/release-0.2.5] Change behavior on missing/present event to warn instead of asserting.

2017-02-07 Thread nickm
commit 457d38a6e9212de3a5cab24fc59829c689f88560 Author: Nick Mathewson Date: Fri Mar 11 10:50:36 2016 -0500 Change behavior on missing/present event to warn instead of asserting. Add a changes file. --- changes/bug16248 | 8 src/or/main.c| 49

[tor-commits] [tor/release-0.2.6] Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix

2017-02-07 Thread nickm
commit 85a2487f9704cfeff0255c5f660d977ec9c30cff Author: Nick Mathewson Date: Tue Feb 7 09:49:23 2017 -0500 Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix --- src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c in

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

2017-02-07 Thread nickm
commit c056d19323e499a0003ba9de0db2bdee9c301872 Merge: b9ef21c 85a2487 Author: Nick Mathewson Date: Tue Feb 7 10:37:31 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug16248 | 8 src/or/main.c| 55 +++ 2 fi

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

2017-02-07 Thread nickm
commit 2f6a66a17402029b58f7a29af7c0eae56f5ea390 Merge: 72d9e05 2ce4330 Author: Nick Mathewson Date: Tue Feb 7 10:39:50 2017 -0500 Merge branch 'maint-0.2.5' into release-0.2.5 changes/bug16248 | 8 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- src/or/main.c| 55 +

[tor-commits] [tor/release-0.2.5] If we start/stop reading on a dnsserv connection, don't assert.

2017-02-07 Thread nickm
commit 650c03127a877eb0de1cfad8afa5cb3d8474a956 Author: Nick Mathewson Date: Fri Mar 11 10:33:19 2016 -0500 If we start/stop reading on a dnsserv connection, don't assert. Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha. --- src/or/main.c | 12 1 fil

[tor-commits] [tor/release-0.2.5] Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix

2017-02-07 Thread nickm
commit 85a2487f9704cfeff0255c5f660d977ec9c30cff Author: Nick Mathewson Date: Tue Feb 7 09:49:23 2017 -0500 Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix --- src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c in

[tor-commits] [tor/release-0.2.4] Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix

2017-02-07 Thread nickm
commit 85a2487f9704cfeff0255c5f660d977ec9c30cff Author: Nick Mathewson Date: Tue Feb 7 09:49:23 2017 -0500 Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix --- src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c in

[tor-commits] [tor/release-0.2.6] Change behavior on missing/present event to warn instead of asserting.

2017-02-07 Thread nickm
commit 457d38a6e9212de3a5cab24fc59829c689f88560 Author: Nick Mathewson Date: Fri Mar 11 10:50:36 2016 -0500 Change behavior on missing/present event to warn instead of asserting. Add a changes file. --- changes/bug16248 | 8 src/or/main.c| 49

[tor-commits] [tor/release-0.2.6] If we start/stop reading on a dnsserv connection, don't assert.

2017-02-07 Thread nickm
commit 650c03127a877eb0de1cfad8afa5cb3d8474a956 Author: Nick Mathewson Date: Fri Mar 11 10:33:19 2016 -0500 If we start/stop reading on a dnsserv connection, don't assert. Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha. --- src/or/main.c | 12 1 fil

[tor-commits] [tor/master] Add comments to connection_check_event().

2017-02-07 Thread nickm
commit cfeb1db2fb881db85a11d80e70a1a14c62b46950 Author: Nick Mathewson Date: Mon Mar 14 12:53:21 2016 -0400 Add comments to connection_check_event(). --- src/or/main.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 1200b55..89e5a51 10064

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

2017-02-07 Thread nickm
commit f2a30413a35bb360323a98fb124fbc629245978d Merge: 5446cb8 2ce4330 Author: Nick Mathewson Date: Tue Feb 7 10:37:53 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug16248 | 8 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- src/or/main.c| 55 +++

[tor-commits] [tor/master] Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix

2017-02-07 Thread nickm
commit 85a2487f9704cfeff0255c5f660d977ec9c30cff Author: Nick Mathewson Date: Tue Feb 7 09:49:23 2017 -0500 Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix --- src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c in

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

2017-02-07 Thread nickm
commit 23f1caf2af300c55a33b7cb3f1671b0b9c2f73f2 Merge: 65cda78 eca4a89 Author: Nick Mathewson Date: Tue Feb 7 10:39:23 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list tor-commits@lists.torproject.org https://li

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

2017-02-07 Thread nickm
commit eca4a89319c566c0e320c7f713aed0f7e34330eb Merge: a9f936d 4bce207 Author: Nick Mathewson Date: Tue Feb 7 10:39:13 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list tor-commits@lists.torproject.org https:/

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

2017-02-07 Thread nickm
commit 4bce2072acaca38d40086c943d8f332ed2c2cf50 Merge: 86d5a6f f2a3041 Author: Nick Mathewson Date: Tue Feb 7 10:39:03 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) ___

[tor-commits] [tor/master] Change behavior on missing/present event to warn instead of asserting.

2017-02-07 Thread nickm
commit 457d38a6e9212de3a5cab24fc59829c689f88560 Author: Nick Mathewson Date: Fri Mar 11 10:50:36 2016 -0500 Change behavior on missing/present event to warn instead of asserting. Add a changes file. --- changes/bug16248 | 8 src/or/main.c| 49

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

2017-02-07 Thread nickm
commit 9a9f4ffdfa965e50de05a4f1bd8c4d68cfb95f12 Merge: 274094b 23f1caf Author: Nick Mathewson Date: Tue Feb 7 10:39:36 2017 -0500 Merge branch 'maint-0.2.9' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.or

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

2017-02-07 Thread nickm
commit 4bce2072acaca38d40086c943d8f332ed2c2cf50 Merge: 86d5a6f f2a3041 Author: Nick Mathewson Date: Tue Feb 7 10:39:03 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) ___

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

2017-02-07 Thread nickm
commit c056d19323e499a0003ba9de0db2bdee9c301872 Merge: b9ef21c 85a2487 Author: Nick Mathewson Date: Tue Feb 7 10:37:31 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug16248 | 8 src/or/main.c| 55 +++ 2 fi

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5

2017-02-07 Thread nickm
commit 2ce43302490ac916be4188bff70f70958aee1790 Merge: c056d19 0ca3f49 Author: Nick Mathewson Date: Tue Feb 7 10:37:43 2017 -0500 Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3

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

2017-02-07 Thread nickm
commit f2a30413a35bb360323a98fb124fbc629245978d Merge: 5446cb8 2ce4330 Author: Nick Mathewson Date: Tue Feb 7 10:37:53 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug16248 | 8 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- src/or/main.c| 55 +++

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

2017-02-07 Thread nickm
commit f2a30413a35bb360323a98fb124fbc629245978d Merge: 5446cb8 2ce4330 Author: Nick Mathewson Date: Tue Feb 7 10:37:53 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug16248 | 8 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- src/or/main.c| 55 +++

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

2017-02-07 Thread nickm
commit c056d19323e499a0003ba9de0db2bdee9c301872 Merge: b9ef21c 85a2487 Author: Nick Mathewson Date: Tue Feb 7 10:37:31 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug16248 | 8 src/or/main.c| 55 +++ 2 fi

[tor-commits] [tor/master] If we start/stop reading on a dnsserv connection, don't assert.

2017-02-07 Thread nickm
commit 650c03127a877eb0de1cfad8afa5cb3d8474a956 Author: Nick Mathewson Date: Fri Mar 11 10:33:19 2016 -0500 If we start/stop reading on a dnsserv connection, don't assert. Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha. --- src/or/main.c | 12 1 fil

[tor-commits] [tor/maint-0.2.9] Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix

2017-02-07 Thread nickm
commit 85a2487f9704cfeff0255c5f660d977ec9c30cff Author: Nick Mathewson Date: Tue Feb 7 09:49:23 2017 -0500 Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix --- src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c in

[tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5

2017-02-07 Thread nickm
commit 2ce43302490ac916be4188bff70f70958aee1790 Merge: c056d19 0ca3f49 Author: Nick Mathewson Date: Tue Feb 7 10:37:43 2017 -0500 Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3

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

2017-02-07 Thread nickm
commit 23f1caf2af300c55a33b7cb3f1671b0b9c2f73f2 Merge: 65cda78 eca4a89 Author: Nick Mathewson Date: Tue Feb 7 10:39:23 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 ___ tor-commits mailing list tor-commits@lists.torproject.org https:/

[tor-commits] [tor/maint-0.2.7] Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5

2017-02-07 Thread nickm
commit 2ce43302490ac916be4188bff70f70958aee1790 Merge: c056d19 0ca3f49 Author: Nick Mathewson Date: Tue Feb 7 10:37:43 2017 -0500 Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3

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

2017-02-07 Thread nickm
commit eca4a89319c566c0e320c7f713aed0f7e34330eb Merge: a9f936d 4bce207 Author: Nick Mathewson Date: Tue Feb 7 10:39:13 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list tor-commits@lists.torproject.org https:/

[tor-commits] [tor/maint-0.2.8] Add comments to connection_check_event().

2017-02-07 Thread nickm
commit cfeb1db2fb881db85a11d80e70a1a14c62b46950 Author: Nick Mathewson Date: Mon Mar 14 12:53:21 2016 -0400 Add comments to connection_check_event(). --- src/or/main.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 1200b55..89e5a51 10064

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

2017-02-07 Thread nickm
commit 4bce2072acaca38d40086c943d8f332ed2c2cf50 Merge: 86d5a6f f2a3041 Author: Nick Mathewson Date: Tue Feb 7 10:39:03 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) _

[tor-commits] [tor/maint-0.2.8] If we start/stop reading on a dnsserv connection, don't assert.

2017-02-07 Thread nickm
commit 650c03127a877eb0de1cfad8afa5cb3d8474a956 Author: Nick Mathewson Date: Fri Mar 11 10:33:19 2016 -0500 If we start/stop reading on a dnsserv connection, don't assert. Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha. --- src/or/main.c | 12 1 fil

[tor-commits] [tor/maint-0.2.9] Change behavior on missing/present event to warn instead of asserting.

2017-02-07 Thread nickm
commit 457d38a6e9212de3a5cab24fc59829c689f88560 Author: Nick Mathewson Date: Fri Mar 11 10:50:36 2016 -0500 Change behavior on missing/present event to warn instead of asserting. Add a changes file. --- changes/bug16248 | 8 src/or/main.c| 49

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

2017-02-07 Thread nickm
commit eca4a89319c566c0e320c7f713aed0f7e34330eb Merge: a9f936d 4bce207 Author: Nick Mathewson Date: Tue Feb 7 10:39:13 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8 ___ tor-commits mailing list tor-commits@lists.torproject.org https://li

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

2017-02-07 Thread nickm
commit f2a30413a35bb360323a98fb124fbc629245978d Merge: 5446cb8 2ce4330 Author: Nick Mathewson Date: Tue Feb 7 10:37:53 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug16248 | 8 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- src/or/main.c| 55 +++

[tor-commits] [tor/maint-0.2.8] Change behavior on missing/present event to warn instead of asserting.

2017-02-07 Thread nickm
commit 457d38a6e9212de3a5cab24fc59829c689f88560 Author: Nick Mathewson Date: Fri Mar 11 10:50:36 2016 -0500 Change behavior on missing/present event to warn instead of asserting. Add a changes file. --- changes/bug16248 | 8 src/or/main.c| 49

[tor-commits] [tor/maint-0.2.8] Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5

2017-02-07 Thread nickm
commit 2ce43302490ac916be4188bff70f70958aee1790 Merge: c056d19 0ca3f49 Author: Nick Mathewson Date: Tue Feb 7 10:37:43 2017 -0500 Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3

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

2017-02-07 Thread nickm
commit f2a30413a35bb360323a98fb124fbc629245978d Merge: 5446cb8 2ce4330 Author: Nick Mathewson Date: Tue Feb 7 10:37:53 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug16248 | 8 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- src/or/main.c| 55 +++

[tor-commits] [tor/maint-0.2.8] Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix

2017-02-07 Thread nickm
commit 85a2487f9704cfeff0255c5f660d977ec9c30cff Author: Nick Mathewson Date: Tue Feb 7 09:49:23 2017 -0500 Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix --- src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c in

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

2017-02-07 Thread nickm
commit 4bce2072acaca38d40086c943d8f332ed2c2cf50 Merge: 86d5a6f f2a3041 Author: Nick Mathewson Date: Tue Feb 7 10:39:03 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug18710 | 6 ++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) ___

[tor-commits] [tor/maint-0.2.9] If we start/stop reading on a dnsserv connection, don't assert.

2017-02-07 Thread nickm
commit 650c03127a877eb0de1cfad8afa5cb3d8474a956 Author: Nick Mathewson Date: Fri Mar 11 10:33:19 2016 -0500 If we start/stop reading on a dnsserv connection, don't assert. Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha. --- src/or/main.c | 12 1 fil

[tor-commits] [tor/maint-0.2.7] If we start/stop reading on a dnsserv connection, don't assert.

2017-02-07 Thread nickm
commit 650c03127a877eb0de1cfad8afa5cb3d8474a956 Author: Nick Mathewson Date: Fri Mar 11 10:33:19 2016 -0500 If we start/stop reading on a dnsserv connection, don't assert. Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha. --- src/or/main.c | 12 1 fil

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

2017-02-07 Thread nickm
commit c056d19323e499a0003ba9de0db2bdee9c301872 Merge: b9ef21c 85a2487 Author: Nick Mathewson Date: Tue Feb 7 10:37:31 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug16248 | 8 src/or/main.c| 55 +++ 2 fi

[tor-commits] [tor/maint-0.2.7] Add comments to connection_check_event().

2017-02-07 Thread nickm
commit cfeb1db2fb881db85a11d80e70a1a14c62b46950 Author: Nick Mathewson Date: Mon Mar 14 12:53:21 2016 -0400 Add comments to connection_check_event(). --- src/or/main.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 1200b55..89e5a51 10064

[tor-commits] [tor/maint-0.2.7] Change behavior on missing/present event to warn instead of asserting.

2017-02-07 Thread nickm
commit 457d38a6e9212de3a5cab24fc59829c689f88560 Author: Nick Mathewson Date: Fri Mar 11 10:50:36 2016 -0500 Change behavior on missing/present event to warn instead of asserting. Add a changes file. --- changes/bug16248 | 8 src/or/main.c| 49

[tor-commits] [tor/maint-0.2.9] Add comments to connection_check_event().

2017-02-07 Thread nickm
commit cfeb1db2fb881db85a11d80e70a1a14c62b46950 Author: Nick Mathewson Date: Mon Mar 14 12:53:21 2016 -0400 Add comments to connection_check_event(). --- src/or/main.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 1200b55..89e5a51 10064

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

2017-02-07 Thread nickm
commit c056d19323e499a0003ba9de0db2bdee9c301872 Merge: b9ef21c 85a2487 Author: Nick Mathewson Date: Tue Feb 7 10:37:31 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug16248 | 8 src/or/main.c| 55 +++ 2 fi

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

2017-02-07 Thread nickm
commit c056d19323e499a0003ba9de0db2bdee9c301872 Merge: b9ef21c 85a2487 Author: Nick Mathewson Date: Tue Feb 7 10:37:31 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug16248 | 8 src/or/main.c| 55 +++ 2 fi

[tor-commits] [tor/maint-0.2.7] Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix

2017-02-07 Thread nickm
commit 85a2487f9704cfeff0255c5f660d977ec9c30cff Author: Nick Mathewson Date: Tue Feb 7 09:49:23 2017 -0500 Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix --- src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c in

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

2017-02-07 Thread nickm
commit c056d19323e499a0003ba9de0db2bdee9c301872 Merge: b9ef21c 85a2487 Author: Nick Mathewson Date: Tue Feb 7 10:37:31 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug16248 | 8 src/or/main.c| 55 +++ 2 fi

[tor-commits] [tor/maint-0.2.5] Change behavior on missing/present event to warn instead of asserting.

2017-02-07 Thread nickm
commit 457d38a6e9212de3a5cab24fc59829c689f88560 Author: Nick Mathewson Date: Fri Mar 11 10:50:36 2016 -0500 Change behavior on missing/present event to warn instead of asserting. Add a changes file. --- changes/bug16248 | 8 src/or/main.c| 49

[tor-commits] [tor/maint-0.2.6] Add comments to connection_check_event().

2017-02-07 Thread nickm
commit cfeb1db2fb881db85a11d80e70a1a14c62b46950 Author: Nick Mathewson Date: Mon Mar 14 12:53:21 2016 -0400 Add comments to connection_check_event(). --- src/or/main.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 1200b55..89e5a51 10064

  1   2   3   4   5   >