[tor-commits] [translation/mat-gui_completed] Update translations for mat-gui_completed

2018-01-19 Thread translation
commit f417ca313735d07c241aaa81a94ae9f41ab540e2 Author: Translation commit bot Date: Fri Jan 19 12:46:35 2018 + Update translations for mat-gui_completed --- is.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is.po b/is.po index

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2018-01-19 Thread translation
commit df2abadb8f4e0ccf217315718da6880d8b0250cd Author: Translation commit bot Date: Fri Jan 19 12:47:15 2018 + Update translations for tails-misc_completed --- is.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is.po b/is.po index

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2018-01-19 Thread translation
commit 5265b2f87909665a0e54cded389a98e93cbb3c5e Author: Translation commit bot Date: Fri Jan 19 12:46:29 2018 + Update translations for mat-gui --- is.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is.po b/is.po index

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-01-19 Thread translation
commit 2d2aa94d168a95436357f6234a3457d089ec9422 Author: Translation commit bot Date: Fri Jan 19 12:47:10 2018 + Update translations for tails-misc --- is.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is.po b/is.po index

[tor-commits] [tor/maint-0.3.2] Work around Travis CI ptrace regression

2018-01-19 Thread nickm
commit 0e7f1b06e90e91006e781c3c8387e15368abd543 Author: Taylor Yu Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents

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

2018-01-19 Thread nickm
commit 1cf11b69408ab3707de01711308a05e223a767f5 Merge: b85fa0bd5 36567c5ca Author: Nick Mathewson Date: Fri Jan 19 10:17:05 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

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

2018-01-19 Thread nickm
commit 36567c5ca4a1f9800415c772c87ee17dfba8d75d Merge: 9464da210 49de586ad Author: Nick Mathewson Date: Fri Jan 19 10:16:47 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

[tor-commits] [tor/maint-0.3.0] Work around Travis CI ptrace regression

2018-01-19 Thread nickm
commit 49de586add6394c7a04c9a982fbe66b185cf4e58 Author: Taylor Yu Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents

[tor-commits] [tor/maint-0.3.1] Work around Travis CI ptrace regression

2018-01-19 Thread nickm
commit 49de586add6394c7a04c9a982fbe66b185cf4e58 Author: Taylor Yu Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents

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

2018-01-19 Thread nickm
commit 9b19e33bedcdd107d0599ab795cccfc2d7cb93dc Merge: f406b9df0 1cf11b694 Author: Nick Mathewson Date: Fri Jan 19 10:17:33 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid 0.2.5 version of #24863 fix.

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

2018-01-19 Thread nickm
commit 36567c5ca4a1f9800415c772c87ee17dfba8d75d Merge: 9464da210 49de586ad Author: Nick Mathewson Date: Fri Jan 19 10:16:47 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

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

2018-01-19 Thread nickm
commit 1cf11b69408ab3707de01711308a05e223a767f5 Merge: b85fa0bd5 36567c5ca Author: Nick Mathewson Date: Fri Jan 19 10:17:05 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

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

2018-01-19 Thread nickm
commit 9b19e33bedcdd107d0599ab795cccfc2d7cb93dc Merge: f406b9df0 1cf11b694 Author: Nick Mathewson Date: Fri Jan 19 10:17:33 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid 0.2.5 version of #24863 fix.

[tor-commits] [tor/master] Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1

2018-01-19 Thread nickm
commit 483a59ec2a8285edcf4688755a9a17ddbdab75be Merge: 9b19e33be 0e7f1b06e Author: Nick Mathewson Date: Fri Jan 19 10:18:21 2018 -0500 Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1 .travis.yml | 35

[tor-commits] [tor/master] Work around Travis CI ptrace regression

2018-01-19 Thread nickm
commit 3bf9174fa37ed09b796dd34c0c2918dae7d4de0d Author: Taylor Yu Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents

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

2018-01-19 Thread nickm
commit 36567c5ca4a1f9800415c772c87ee17dfba8d75d Merge: 9464da210 49de586ad Author: Nick Mathewson Date: Fri Jan 19 10:16:47 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

[tor-commits] [tor/release-0.3.0] Work around Travis CI ptrace regression

2018-01-19 Thread nickm
commit 49de586add6394c7a04c9a982fbe66b185cf4e58 Author: Taylor Yu Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents

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

2018-01-19 Thread nickm
commit 1cf11b69408ab3707de01711308a05e223a767f5 Merge: b85fa0bd5 36567c5ca Author: Nick Mathewson Date: Fri Jan 19 10:17:05 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

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

2018-01-19 Thread nickm
commit 36567c5ca4a1f9800415c772c87ee17dfba8d75d Merge: 9464da210 49de586ad Author: Nick Mathewson Date: Fri Jan 19 10:16:47 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

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

2018-01-19 Thread nickm
commit 7d1d868ea0ed2cacd845677a86b4ddb813962ee1 Merge: e212c752f 49de586ad Author: Nick Mathewson Date: Fri Jan 19 10:18:59 2018 -0500 Merge branch 'maint-0.2.5' into release-0.2.5 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

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

2018-01-19 Thread nickm
commit fa6137a903ef984f64d89e984cf285bf5158e08f Merge: 63e549a6b e2aacf100 Author: Nick Mathewson Date: Fri Jan 19 10:18:59 2018 -0500 Merge branch 'maint-0.3.2' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Work around Travis CI ptrace regression

2018-01-19 Thread nickm
commit 49de586add6394c7a04c9a982fbe66b185cf4e58 Author: Taylor Yu Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents

[tor-commits] [tor/master] Merge remote-tracking branch 'tlyu-github/travis-workaround-master'

2018-01-19 Thread nickm
commit 63e549a6b4b57b2d70b83d14418bcad1f86136ce Merge: 9652c65fa 3bf9174fa Author: Nick Mathewson Date: Fri Jan 19 10:18:55 2018 -0500 Merge remote-tracking branch 'tlyu-github/travis-workaround-master' .travis.yml | 42 +- 1

[tor-commits] [tor/release-0.2.5] Work around Travis CI ptrace regression

2018-01-19 Thread nickm
commit 49de586add6394c7a04c9a982fbe66b185cf4e58 Author: Taylor Yu Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents

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

2018-01-19 Thread nickm
commit 9652c65fa3b9b3346d346daea05c8b3c22b3e125 Merge: 2c9e0a286 483a59ec2 Author: Nick Mathewson Date: Fri Jan 19 10:18:35 2018 -0500 Merge branch 'maint-0.3.1' "ours" merge to avoid the 0.3.1 version of the 24863 fix.

[tor-commits] [tor/master] Work around Travis CI ptrace regression

2018-01-19 Thread nickm
commit 0e7f1b06e90e91006e781c3c8387e15368abd543 Author: Taylor Yu Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents

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

2018-01-19 Thread nickm
commit 1cf11b69408ab3707de01711308a05e223a767f5 Merge: b85fa0bd5 36567c5ca Author: Nick Mathewson Date: Fri Jan 19 10:17:05 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

[tor-commits] [tor/release-0.3.1] Work around Travis CI ptrace regression

2018-01-19 Thread nickm
commit 49de586add6394c7a04c9a982fbe66b185cf4e58 Author: Taylor Yu Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents

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

2018-01-19 Thread nickm
commit 1cf11b69408ab3707de01711308a05e223a767f5 Merge: b85fa0bd5 36567c5ca Author: Nick Mathewson Date: Fri Jan 19 10:17:05 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

[tor-commits] [tor/master] Add a mostly disabled feature to debug restarting in-process

2018-01-19 Thread nickm
commit 97d9ba2380e0c894a1b611bdb4f35d0fe98a837a Author: Nick Mathewson Date: Mon Dec 11 10:57:00 2017 -0500 Add a mostly disabled feature to debug restarting in-process For 23847, we want Tor to be able to shut down and then restart in the same process.

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

2018-01-19 Thread nickm
commit 2c9e0a286cad3c0bbc1797f75a8c516df476db62 Merge: e7907f15f 97d9ba238 Author: Nick Mathewson Date: Fri Jan 19 09:52:14 2018 -0500 Merge branch 'restart_debug_squashed' changes/feature24583 | 9 + configure.ac | 6 ++ src/or/main.c|

[tor-commits] [tor/maint-0.2.5] Work around Travis CI ptrace regression

2018-01-19 Thread nickm
commit 49de586add6394c7a04c9a982fbe66b185cf4e58 Author: Taylor Yu Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents

[tor-commits] [tor/maint-0.3.2] Work around Travis CI ptrace regression

2018-01-19 Thread nickm
commit 49de586add6394c7a04c9a982fbe66b185cf4e58 Author: Taylor Yu Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents

[tor-commits] [tor/maint-0.3.1] Work around Travis CI ptrace regression

2018-01-19 Thread nickm
commit 0e7f1b06e90e91006e781c3c8387e15368abd543 Author: Taylor Yu Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents

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

2018-01-19 Thread nickm
commit 36567c5ca4a1f9800415c772c87ee17dfba8d75d Merge: 9464da210 49de586ad Author: Nick Mathewson Date: Fri Jan 19 10:16:47 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1

2018-01-19 Thread nickm
commit 483a59ec2a8285edcf4688755a9a17ddbdab75be Merge: 9b19e33be 0e7f1b06e Author: Nick Mathewson Date: Fri Jan 19 10:18:21 2018 -0500 Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1 .travis.yml | 35

[tor-commits] [tor/release-0.2.9] Work around Travis CI ptrace regression

2018-01-19 Thread nickm
commit 49de586add6394c7a04c9a982fbe66b185cf4e58 Author: Taylor Yu Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents

[tor-commits] [tor/maint-0.2.9] Work around Travis CI ptrace regression

2018-01-19 Thread nickm
commit 49de586add6394c7a04c9a982fbe66b185cf4e58 Author: Taylor Yu Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents

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

2018-01-19 Thread nickm
commit e2aacf100f5112aa8d0564b9f90ce38048ee0a82 Merge: 44388757c 483a59ec2 Author: Nick Mathewson Date: Fri Jan 19 10:18:29 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 35 +++ 1 file changed, 31 insertions(+),

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

2018-01-19 Thread nickm
commit 36567c5ca4a1f9800415c772c87ee17dfba8d75d Merge: 9464da210 49de586ad Author: Nick Mathewson Date: Fri Jan 19 10:16:47 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

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

2018-01-19 Thread nickm
commit 1cf11b69408ab3707de01711308a05e223a767f5 Merge: b85fa0bd5 36567c5ca Author: Nick Mathewson Date: Fri Jan 19 10:17:05 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

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

2018-01-19 Thread nickm
commit 4953efec39b6902cf1cd4d7b741d716df0361c82 Merge: e8fdac775 36567c5ca Author: Nick Mathewson Date: Fri Jan 19 10:18:59 2018 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1

2018-01-19 Thread nickm
commit 483a59ec2a8285edcf4688755a9a17ddbdab75be Merge: 9b19e33be 0e7f1b06e Author: Nick Mathewson Date: Fri Jan 19 10:18:21 2018 -0500 Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1 .travis.yml | 35

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

2018-01-19 Thread nickm
commit 9b19e33bedcdd107d0599ab795cccfc2d7cb93dc Merge: f406b9df0 1cf11b694 Author: Nick Mathewson Date: Fri Jan 19 10:17:33 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid 0.2.5 version of #24863 fix.

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

2018-01-19 Thread nickm
commit 36567c5ca4a1f9800415c772c87ee17dfba8d75d Merge: 9464da210 49de586ad Author: Nick Mathewson Date: Fri Jan 19 10:16:47 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

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

2018-01-19 Thread nickm
commit e2aacf100f5112aa8d0564b9f90ce38048ee0a82 Merge: 44388757c 483a59ec2 Author: Nick Mathewson Date: Fri Jan 19 10:18:29 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 35 +++ 1 file changed, 31 insertions(+),

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

2018-01-19 Thread nickm
commit e2aacf100f5112aa8d0564b9f90ce38048ee0a82 Merge: 44388757c 483a59ec2 Author: Nick Mathewson Date: Fri Jan 19 10:18:29 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 35 +++ 1 file changed, 31 insertions(+),

[tor-commits] [tor/release-0.3.1] Work around Travis CI ptrace regression

2018-01-19 Thread nickm
commit 0e7f1b06e90e91006e781c3c8387e15368abd543 Author: Taylor Yu Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents

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

2018-01-19 Thread nickm
commit c30d2daae0c520e24cad6ef4105ec52bca5ead3a Merge: 256cd9d87 483a59ec2 Author: Nick Mathewson Date: Fri Jan 19 10:18:59 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 .travis.yml | 35 +++ 1 file changed, 31

[tor-commits] [tor/release-0.3.2] Work around Travis CI ptrace regression

2018-01-19 Thread nickm
commit 49de586add6394c7a04c9a982fbe66b185cf4e58 Author: Taylor Yu Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents

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

2018-01-19 Thread nickm
commit 9b19e33bedcdd107d0599ab795cccfc2d7cb93dc Merge: f406b9df0 1cf11b694 Author: Nick Mathewson Date: Fri Jan 19 10:17:33 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid 0.2.5 version of #24863 fix.

[tor-commits] [tor/release-0.3.2] Work around Travis CI ptrace regression

2018-01-19 Thread nickm
commit 0e7f1b06e90e91006e781c3c8387e15368abd543 Author: Taylor Yu Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents

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

2018-01-19 Thread nickm
commit 36567c5ca4a1f9800415c772c87ee17dfba8d75d Merge: 9464da210 49de586ad Author: Nick Mathewson Date: Fri Jan 19 10:16:47 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

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

2018-01-19 Thread nickm
commit b2b59b06c8a2d548453302413241d7f663f6c39c Merge: 2ffdf43e7 1cf11b694 Author: Nick Mathewson Date: Fri Jan 19 10:18:59 2018 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1

2018-01-19 Thread nickm
commit 483a59ec2a8285edcf4688755a9a17ddbdab75be Merge: 9b19e33be 0e7f1b06e Author: Nick Mathewson Date: Fri Jan 19 10:18:21 2018 -0500 Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1 .travis.yml | 35

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

2018-01-19 Thread nickm
commit 1cf11b69408ab3707de01711308a05e223a767f5 Merge: b85fa0bd5 36567c5ca Author: Nick Mathewson Date: Fri Jan 19 10:17:05 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

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

2018-01-19 Thread nickm
commit 698334eee7252c533882972aa8c734e3b674edaf Merge: c9b4ddc88 e2aacf100 Author: Nick Mathewson Date: Fri Jan 19 10:18:59 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 .travis.yml | 35 +++ 1 file changed, 31

[tor-commits] [tor/release-0.3.1] Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1

2018-01-19 Thread nickm
commit 483a59ec2a8285edcf4688755a9a17ddbdab75be Merge: 9b19e33be 0e7f1b06e Author: Nick Mathewson Date: Fri Jan 19 10:18:21 2018 -0500 Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1 .travis.yml | 35

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

2018-01-19 Thread nickm
commit 36567c5ca4a1f9800415c772c87ee17dfba8d75d Merge: 9464da210 49de586ad Author: Nick Mathewson Date: Fri Jan 19 10:16:47 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 +--- 1 file changed, 21 insertions(+), 3

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

2018-01-19 Thread nickm
commit 9b19e33bedcdd107d0599ab795cccfc2d7cb93dc Merge: f406b9df0 1cf11b694 Author: Nick Mathewson Date: Fri Jan 19 10:17:33 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid 0.2.5 version of #24863 fix.

[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2018-01-19 Thread translation
commit de09c5be029f7e54e7cf572eb83eaac0f87a4970 Author: Translation commit bot Date: Fri Jan 19 15:16:12 2018 + Update translations for tails-persistence-setup_completed --- is/is.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2018-01-19 Thread translation
commit 88a0ace1fa9b3362007d03dc96c61682009ee2ff Author: Translation commit bot Date: Fri Jan 19 15:16:06 2018 + Update translations for tails-persistence-setup --- is/is.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/is.po

[tor-commits] [tor/master] Don't call Libevent's event_base_free() on NULL.

2018-01-19 Thread nickm
commit e7907f15f9b7685fbdd24939a7266235a066f8a0 Author: Nick Mathewson Date: Fri Jan 19 09:45:10 2018 -0500 Don't call Libevent's event_base_free() on NULL. It doesn't crash, but it produces a warning. Fixes bug 24933; bugfix on

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

2018-01-19 Thread translation
commit 306296065bbc52adaa18eb363d20b858194e687f Author: Translation commit bot Date: Fri Jan 19 15:15:31 2018 + Update translations for whisperback_completed --- is/is.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/is.po

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

2018-01-19 Thread translation
commit 902f42bcaab8dd4356248fde81538eab43e394a2 Author: Translation commit bot Date: Fri Jan 19 15:15:25 2018 + Update translations for whisperback --- is/is.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/is.po b/is/is.po index

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

2018-01-19 Thread translation
commit 11cdf4660e44777a9dd150c54be276643ada2706 Author: Translation commit bot Date: Fri Jan 19 18:45:12 2018 + Update translations for bridgedb_completed --- mk/LC_MESSAGES/bridgedb.po | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-)

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

2018-01-19 Thread translation
commit c737d44f6209636e1ce74dc364204c3e60ae050e Author: Translation commit bot Date: Fri Jan 19 18:45:05 2018 + Update translations for bridgedb --- mk/LC_MESSAGES/bridgedb.po | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git

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

2018-01-19 Thread translation
commit 39e5d05f274b6a973059357f9ef5be486560ce98 Author: Translation commit bot Date: Fri Jan 19 19:15:05 2018 + Update translations for bridgedb --- mk/LC_MESSAGES/bridgedb.po | 48 +++--- 1 file changed, 24

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

2018-01-19 Thread translation
commit cb6ce4f87c20a40112d9f787dab1cade310c3533 Author: Translation commit bot Date: Fri Jan 19 19:15:11 2018 + Update translations for bridgedb_completed --- mk/LC_MESSAGES/bridgedb.po | 48 +++--- 1 file changed, 24

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

2018-01-19 Thread translation
commit ca5bd3209bb56c69f5038035beedd0763d08bb36 Author: Translation commit bot Date: Fri Jan 19 19:45:42 2018 + Update translations for https_everywhere --- mk/https-everywhere.dtd| 14 +++--- mk/https-everywhere.properties | 14

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

2018-01-19 Thread translation
commit c80f6aa1680d0247ee41d1a9848058a1b33e118d Author: Translation commit bot Date: Fri Jan 19 19:45:54 2018 + Update translations for https_everywhere_completed --- mk/https-everywhere.dtd| 14 +++--- mk/https-everywhere.properties | 14

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

2018-01-19 Thread translation
commit cf539305dd1f462d512e65be33d0aa9851398533 Author: Translation commit bot Date: Fri Jan 19 19:45:32 2018 + Update translations for whisperback_completed --- fr/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/fr.po

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-01-19 Thread translation
commit e40150903d72f36061d93dcf6be87435be65f003 Author: Translation commit bot Date: Fri Jan 19 19:47:22 2018 + Update translations for tails-misc --- fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr.po b/fr.po index

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2018-01-19 Thread translation
commit 98c76698bc2d1f60023d9f3286c91ec735c50d3e Author: Translation commit bot Date: Fri Jan 19 19:47:28 2018 + Update translations for tails-misc_completed --- fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr.po b/fr.po index

[tor-commits] [translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed

2018-01-19 Thread translation
commit 553e3fd2bb27c8ee6cedb63ad3405ad7b9f15f4a Author: Translation commit bot Date: Fri Jan 19 19:48:35 2018 + Update translations for tails-perl5lib_completed --- fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr.po b/fr.po

[tor-commits] [tor/maint-0.3.0] MAX_REND_FAILURES is 1, but we would try three times

2018-01-19 Thread nickm
commit a15eb9ff439623f800de813c1a78eeb5d61f7f5a Author: Roger Dingledine Date: Mon Jan 15 16:30:55 2018 -0500 MAX_REND_FAILURES is 1, but we would try three times Fix an "off by 2" error in counting rendezvous failures on the onion service side.

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

2018-01-19 Thread nickm
commit f98f7ca89865d1a477fc65165b92c86b9d8437fa Merge: f406b9df0 490ae26b2 Author: David Goulet Date: Fri Jan 19 16:21:55 2018 -0500 Merge branch 'bug24895_029_02' into bug24895_031_02 changes/bug24895 | 8 src/or/hs_common.c | 17 +

[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9

2018-01-19 Thread nickm
commit a2aaf9509ba578f4e7705b506ee9a0f764d24ff2 Merge: 36567c5ca 490ae26b2 Author: Nick Mathewson Date: Fri Jan 19 16:29:15 2018 -0500 Merge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9 changes/bug24895 | 8 src/or/rendservice.c |

[tor-commits] [tor/maint-0.2.9] turn MAX_REND_FAILURES into a function

2018-01-19 Thread nickm
commit cc5a9e96674f39677a65daa2f7a2f5af7ac3106e Author: Roger Dingledine Date: Fri Jan 19 02:38:07 2018 -0500 turn MAX_REND_FAILURES into a function no actual changes in behavior --- src/or/rendservice.c | 24 1 file changed, 16

[tor-commits] [tor/maint-0.3.1] MAX_REND_FAILURES is 1, but we would try three times

2018-01-19 Thread nickm
commit a15eb9ff439623f800de813c1a78eeb5d61f7f5a Author: Roger Dingledine Date: Mon Jan 15 16:30:55 2018 -0500 MAX_REND_FAILURES is 1, but we would try three times Fix an "off by 2" error in counting rendezvous failures on the onion service side.

[tor-commits] [tor/maint-0.3.0] hs: Use hs_service_max_rdv_failures consensus param, defaulting to 2

2018-01-19 Thread nickm
commit 490ae26b24a6b2b8843515425cedabf99801163a Author: Roger Dingledine Date: Fri Jan 19 03:00:43 2018 -0500 hs: Use hs_service_max_rdv_failures consensus param, defaulting to 2 --- changes/bug24895 | 10 ++ src/or/rendservice.c | 10 +- 2 files

[tor-commits] [tor/maint-0.2.9] hs: Use hs_service_max_rdv_failures consensus param, defaulting to 2

2018-01-19 Thread nickm
commit 490ae26b24a6b2b8843515425cedabf99801163a Author: Roger Dingledine Date: Fri Jan 19 03:00:43 2018 -0500 hs: Use hs_service_max_rdv_failures consensus param, defaulting to 2 --- changes/bug24895 | 10 ++ src/or/rendservice.c | 10 +- 2 files

[tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9

2018-01-19 Thread nickm
commit a2aaf9509ba578f4e7705b506ee9a0f764d24ff2 Merge: 36567c5ca 490ae26b2 Author: Nick Mathewson Date: Fri Jan 19 16:29:15 2018 -0500 Merge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9 changes/bug24895 | 8 src/or/rendservice.c |

[tor-commits] [tor/maint-0.2.9] MAX_REND_FAILURES is 1, but we would try three times

2018-01-19 Thread nickm
commit a15eb9ff439623f800de813c1a78eeb5d61f7f5a Author: Roger Dingledine Date: Mon Jan 15 16:30:55 2018 -0500 MAX_REND_FAILURES is 1, but we would try three times Fix an "off by 2" error in counting rendezvous failures on the onion service side.

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'dgoulet/bug24895_031_02' into maint-0.3.1

2018-01-19 Thread nickm
commit 00a42277eaa5838e5b7d0b07a53db01780232511 Merge: 483a59ec2 f98f7ca89 Author: Nick Mathewson Date: Fri Jan 19 16:30:02 2018 -0500 Merge remote-tracking branch 'dgoulet/bug24895_031_02' into maint-0.3.1 changes/bug24895 | 8 src/or/hs_common.c |

[tor-commits] [tor/release-0.3.1] Merge remote-tracking branch 'dgoulet/bug24895_031_02' into maint-0.3.1

2018-01-19 Thread nickm
commit 00a42277eaa5838e5b7d0b07a53db01780232511 Merge: 483a59ec2 f98f7ca89 Author: Nick Mathewson Date: Fri Jan 19 16:30:02 2018 -0500 Merge remote-tracking branch 'dgoulet/bug24895_031_02' into maint-0.3.1 changes/bug24895 | 8 src/or/hs_common.c |

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

2018-01-19 Thread nickm
commit f98f7ca89865d1a477fc65165b92c86b9d8437fa Merge: f406b9df0 490ae26b2 Author: David Goulet Date: Fri Jan 19 16:21:55 2018 -0500 Merge branch 'bug24895_029_02' into bug24895_031_02 changes/bug24895 | 8 src/or/hs_common.c | 17 +

[tor-commits] [tor/release-0.3.0] hs: Use hs_service_max_rdv_failures consensus param, defaulting to 2

2018-01-19 Thread nickm
commit 490ae26b24a6b2b8843515425cedabf99801163a Author: Roger Dingledine Date: Fri Jan 19 03:00:43 2018 -0500 hs: Use hs_service_max_rdv_failures consensus param, defaulting to 2 --- changes/bug24895 | 10 ++ src/or/rendservice.c | 10 +- 2 files

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'dgoulet/bug24895_032_02' into maint-0.3.2

2018-01-19 Thread nickm
commit de3cf40fa658d62a61bb620c9dba8e90105da339 Merge: e2aacf100 f870f9c8b Author: Nick Mathewson Date: Fri Jan 19 16:30:44 2018 -0500 Merge remote-tracking branch 'dgoulet/bug24895_032_02' into maint-0.3.2 changes/bug24895 | 8 src/or/hs_circuit.c |

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

2018-01-19 Thread nickm
commit b39c50cde8b1d7e3e27d5a6fc2e58ff208982637 Merge: 1cf11b694 a2aaf9509 Author: Nick Mathewson Date: Fri Jan 19 16:29:43 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 Conflicts: src/or/rendservice.c changes/bug24895 | 8

[tor-commits] [tor/release-0.3.1] Merge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9

2018-01-19 Thread nickm
commit a2aaf9509ba578f4e7705b506ee9a0f764d24ff2 Merge: 36567c5ca 490ae26b2 Author: Nick Mathewson Date: Fri Jan 19 16:29:15 2018 -0500 Merge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9 changes/bug24895 | 8 src/or/rendservice.c |

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

2018-01-19 Thread nickm
commit 03eb2037d11d2014044d9cc90f19d0d35e6045bf Merge: 698334eee 129456e22 Author: Nick Mathewson Date: Fri Jan 19 16:30:53 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24895 | 8 src/or/hs_circuit.c | 7 ++-

[tor-commits] [tor/release-0.2.9] turn MAX_REND_FAILURES into a function

2018-01-19 Thread nickm
commit cc5a9e96674f39677a65daa2f7a2f5af7ac3106e Author: Roger Dingledine Date: Fri Jan 19 02:38:07 2018 -0500 turn MAX_REND_FAILURES into a function no actual changes in behavior --- src/or/rendservice.c | 24 1 file changed, 16

[tor-commits] [tor/release-0.3.1] hs: Use hs_service_max_rdv_failures consensus param, defaulting to 2

2018-01-19 Thread nickm
commit 490ae26b24a6b2b8843515425cedabf99801163a Author: Roger Dingledine Date: Fri Jan 19 03:00:43 2018 -0500 hs: Use hs_service_max_rdv_failures consensus param, defaulting to 2 --- changes/bug24895 | 10 ++ src/or/rendservice.c | 10 +- 2 files

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

2018-01-19 Thread nickm
commit b39c50cde8b1d7e3e27d5a6fc2e58ff208982637 Merge: 1cf11b694 a2aaf9509 Author: Nick Mathewson Date: Fri Jan 19 16:29:43 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 Conflicts: src/or/rendservice.c changes/bug24895 | 8

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

2018-01-19 Thread nickm
commit 7f2e23e7acc0735e5ae933535a1b617a0860e528 Merge: 00a42277e b39c50cde Author: Nick Mathewson Date: Fri Jan 19 16:30:12 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid maint-0.3.0's version of 24895.

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

2018-01-19 Thread nickm
commit 7f2e23e7acc0735e5ae933535a1b617a0860e528 Merge: 00a42277e b39c50cde Author: Nick Mathewson Date: Fri Jan 19 16:30:12 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid maint-0.3.0's version of 24895.

[tor-commits] [tor/release-0.3.0] turn MAX_REND_FAILURES into a function

2018-01-19 Thread nickm
commit cc5a9e96674f39677a65daa2f7a2f5af7ac3106e Author: Roger Dingledine Date: Fri Jan 19 02:38:07 2018 -0500 turn MAX_REND_FAILURES into a function no actual changes in behavior --- src/or/rendservice.c | 24 1 file changed, 16

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

2018-01-19 Thread nickm
commit 129456e22257d24c380bed0f9ebc9d68955a01df Merge: de3cf40fa 7f2e23e7a Author: Nick Mathewson Date: Fri Jan 19 16:30:50 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 ___ tor-commits mailing list

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

2018-01-19 Thread nickm
commit 401e70fba2199a2ca4f243e936a4506d37314032 Merge: 4953efec3 a2aaf9509 Author: Nick Mathewson Date: Fri Jan 19 16:30:53 2018 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug24895 | 8 src/or/rendservice.c | 29

  1   2   3   >