[tor-commits] [tor/master] Enlarge the buffer for a line in a bw file

2015-01-07 Thread nickm
commit 2b9d48791d0b5245e3ccfd267150dfa34541c87c Author: Sebastian Hahn sebast...@torproject.org Date: Wed Jan 7 12:43:21 2015 +0100 Enlarge the buffer for a line in a bw file --- changes/bug14125 |5 + src/or/dirserv.c |2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'

2015-01-07 Thread nickm
commit 49dca8b1beae9c2dade2c3193fa7f77f5c15d869 Merge: 7c5a455 2b9d487 Author: Nick Mathewson ni...@torproject.org Date: Wed Jan 7 07:50:14 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug14125 |5 + src/or/dirserv.c |2 +- 2 files changed, 6

[tor-commits] [tor/maint-0.2.5] Enlarge the buffer for a line in a bw file

2015-01-07 Thread nickm
commit 2b9d48791d0b5245e3ccfd267150dfa34541c87c Author: Sebastian Hahn sebast...@torproject.org Date: Wed Jan 7 12:43:21 2015 +0100 Enlarge the buffer for a line in a bw file --- changes/bug14125 |5 + src/or/dirserv.c |2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

[tor-commits] [webwml/master] remove a mirror by request

2015-01-07 Thread andrew
commit 3a8664e29dacd5e78a0f6ed0eba839dc0d2d1d34 Author: Andrew Lewman and...@torproject.is Date: Wed Jan 7 23:55:18 2015 -0500 remove a mirror by request --- include/tor-mirrors.csv |1 - 1 file changed, 1 deletion(-) diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv

[tor-commits] [torbutton/master] Bug 13835: Add support for TOR_DEFAULT_HOMEPAGE env variable.

2015-01-07 Thread brade
commit a8b1333f08cd79699bec0d3d9a74845487c9a8be Author: linostar linux.a...@gmail.com Date: Tue Jan 6 17:33:39 2015 +0200 Bug 13835: Add support for TOR_DEFAULT_HOMEPAGE env variable. If TOR_DEFAULT_HOMEPAGE is set and the user has not customized the browser home page, it is

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

2015-01-07 Thread nickm
commit cb54cd6745eaf15716aa357fc253f43f26c051a6 Merge: 49dca8b 7984fc1 Author: Nick Mathewson ni...@torproject.org Date: Wed Jan 7 10:06:50 2015 -0500 Merge branch 'bug9286_v3_squashed' changes/bug9286 |4 src/common/util.c| 23 ++-

[tor-commits] [tor/master] Stop accepting milliseconds in various directory contexts

2015-01-07 Thread nickm
commit 7984fc153112baa5c370215f2205025a7648d7b4 Author: Nick Mathewson ni...@torproject.org Date: Thu Jul 18 23:45:40 2013 -0400 Stop accepting milliseconds in various directory contexts Have clients and authorities both have new behavior, since the fix for bug 11243 has gone

[tor-commits] [webwml/master] Update Ubuntu distribution codenames

2015-01-07 Thread sebastian
commit 7bcc1efd81ae53459c9736978fbcb0a8fcb201d2 Author: Sebastian Hahn sebast...@torproject.org Date: Wed Jan 7 12:58:25 2015 +0100 Update Ubuntu distribution codenames patch by dedal0, implements ticket #13847 --- docs/en/debian-vidalia.wml |6 ++ 1 file changed, 6

[tor-commits] [tor/master] Unconfuse coverity when it sees the systemd headers

2015-01-07 Thread nickm
commit 71f409606a686c3be2af22c1247e21b8781d98e6 Author: Nick Mathewson ni...@torproject.org Date: Wed Jan 7 21:09:41 2015 -0500 Unconfuse coverity when it sees the systemd headers --- src/or/main.c |6 ++ 1 file changed, 6 insertions(+) diff --git a/src/or/main.c b/src/or/main.c

[tor-commits] [tor/master] appease make check-spaces

2015-01-07 Thread nickm
commit 79aaad952f4f43a7057c4162ae378d5bad28a77e Author: Nick Mathewson ni...@torproject.org Date: Wed Jan 7 10:09:09 2015 -0500 appease make check-spaces --- src/or/circuitbuild.c |2 +- src/test/test_config.c |1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug12985_024' into bug12985_025

2015-01-07 Thread nickm
commit 139a1c64a0333d7a2af6715e827d5858628683f4 Merge: d8fe499 e9463b0 Author: Nick Mathewson ni...@torproject.org Date: Wed Jan 7 11:54:33 2015 -0500 Merge remote-tracking branch 'public/bug12985_024' into bug12985_025 changes/bug12985 |3 ++- 1 file changed, 2 insertions(+), 1

[tor-commits] [tor/master] Clarify why bug12985 is a thing

2015-01-07 Thread nickm
commit e9463b04e7c396d4344dc658e0c9dae3bdfc15af Author: Nick Mathewson ni...@torproject.org Date: Wed Jan 7 11:52:24 2015 -0500 Clarify why bug12985 is a thing --- changes/bug12985 |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/changes/bug12985 b/changes/bug12985

[tor-commits] [tor/master] Always event_del() connection events before freeing them

2015-01-07 Thread nickm
commit 4144b4552b00c25eba9be7a959aa75c1efbe4a18 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 29 11:33:05 2014 -0400 Always event_del() connection events before freeing them Previously, we had done this only in the connection_free() case, but when we called

[tor-commits] [tor/master] Revert restore the sensible part of ac268a83408e1450544db2f23f364dfa3

2015-01-07 Thread nickm
commit d8fe499e08cf6c04fd6bf6230c916dcedf17dc80 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 29 12:25:05 2014 -0400 Revert restore the sensible part of ac268a83408e1450544db2f23f364dfa3 This reverts commit b82e166bec5fcc468424af1ff71e2e753ac534a2. We don't

[tor-commits] [tor/master] restore the sensible part of ac268a83408e1450544db2f23f364dfa3

2015-01-07 Thread nickm
commit b82e166bec5fcc468424af1ff71e2e753ac534a2 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 29 12:21:57 2014 -0400 restore the sensible part of ac268a83408e1450544db2f23f364dfa3 We don't want to call event_del() postfork, if cpuworkers are multiprocess. ---

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug12985_025'

2015-01-07 Thread nickm
commit 1abd526c75eade83318a6ec6aff84d5f0f079a3b Merge: 7dd8528 139a1c6 Author: Nick Mathewson ni...@torproject.org Date: Wed Jan 7 11:55:50 2015 -0500 Merge remote-tracking branch 'public/bug12985_025' changes/bug12985 |5 + src/common/compat_libevent.c | 14

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug12985_024' into bug12984_025

2015-01-07 Thread nickm
commit b0138cd05540001f084b7bd828b3dcffbaeb5b22 Merge: 37a76d7 b82e166 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 29 12:24:52 2014 -0400 Merge remote-tracking branch 'public/bug12985_024' into bug12984_025 changes/bug12985 |4

[tor-commits] [tor/master] Increase bandwidth usage report interval to 4 hours.

2015-01-07 Thread nickm
commit 6830667d58815219476593901334b2e19554d8af Author: Nick Mathewson ni...@torproject.org Date: Mon Dec 22 12:24:13 2014 -0500 Increase bandwidth usage report interval to 4 hours. --- changes/bug13988 |3 +++ src/or/rephist.c |4 +--- 2 files changed, 4 insertions(+), 3

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug13988_025'

2015-01-07 Thread nickm
commit 7dd852835c24a2db1cc4751f3b9235a8c78bf775 Merge: 79aaad9 6830667 Author: Nick Mathewson ni...@torproject.org Date: Wed Jan 7 11:45:24 2015 -0500 Merge remote-tracking branch 'public/bug13988_025' changes/bug13988 |3 +++ src/or/rephist.c |4 +--- 2 files changed, 4

[tor-commits] [torspec/master] specify GETINFO bw-event-cache for 14128

2015-01-07 Thread nickm
commit 3c44820f3828a009d733bf5224916e83ddf508f0 Author: Nick Mathewson ni...@torproject.org Date: Wed Jan 7 11:41:34 2015 -0500 specify GETINFO bw-event-cache for 14128 --- control-spec.txt |8 1 file changed, 8 insertions(+) diff --git a/control-spec.txt b/control-spec.txt

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

2015-01-07 Thread nickm
commit ceed53c39b19488e3c62f06f79a3e60b0ec38184 Merge: 1abd526 f8baa40 Author: Nick Mathewson ni...@torproject.org Date: Wed Jan 7 13:19:57 2015 -0500 Merge branch 'ticket14128_squashed' changes/ticket14128 |5 + src/or/control.c| 50

[tor-commits] [tor/master] GETINFO bw-event-cache to get information on recent BW events

2015-01-07 Thread nickm
commit f8baa40c01917a6261dd6824097cee98e8ace514 Author: Nick Mathewson ni...@torproject.org Date: Wed Jan 7 11:37:23 2015 -0500 GETINFO bw-event-cache to get information on recent BW events Closes 14128; useful to regain functionality lost because of 13988. --- changes/ticket14128