[tor-commits] [tor/master] Reference bug number in changes file

2014-12-12 Thread nickm
commit 7d5916c0a7622782c6bdb4f5862bf7c6e5bad5f8 Author: Nick Mathewson ni...@torproject.org Date: Fri Dec 12 08:53:42 2014 -0500 Reference bug number in changes file --- changes/bug13941 |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/bug13941

[tor-commits] [tor/master] Fix 13941: make calling log_new_relay_greeting() optional.

2014-12-12 Thread nickm
commit 76753efd7b9fd08fa6b88d096e85f0ff798f2939 Author: meejah mee...@meejah.ca Date: Wed Dec 10 22:30:14 2014 -0700 Fix 13941: make calling log_new_relay_greeting() optional. Specifically, only if we're creating secret_id_key do we log the greeting (and then only if the key is

[tor-commits] [tor/master] Tweak 13942 fix

2014-12-12 Thread nickm
commit 7c5d88897729ba8c128d0c0e01dfd671cf65eb98 Author: Nick Mathewson ni...@torproject.org Date: Fri Dec 12 08:49:52 2014 -0500 Tweak 13942 fix --- changes/bug13942 |2 +- src/or/rendservice.c | 206 +- 2 files changed, 104

[tor-commits] [tor/master] Pre-check hidden-service-dir permissions/ownership

2014-12-12 Thread nickm
commit 85bfad1875994dee84eab8fff49189ba2be0b532 Author: meejah mee...@meejah.ca Date: Wed Dec 10 22:15:04 2014 -0700 Pre-check hidden-service-dir permissions/ownership See ticket #13942 where Tor dies if you feed it a hidden service directory with the wrong owner via SETCONF.

[tor-commits] [tor/master] Merge remote-tracking branch 'meejah/ticket-13941-b'

2014-12-12 Thread nickm
commit 915c9a517ea27a589c50e2768dda3ec41b2f94b9 Merge: 7c5d888 76753ef Author: Nick Mathewson ni...@torproject.org Date: Fri Dec 12 08:53:14 2014 -0500 Merge remote-tracking branch 'meejah/ticket-13941-b' changes/bug13941 |4 src/or/rendservice.c |2 +- src/or/router.c

[tor-commits] [tor/master] fix a long line

2014-12-12 Thread nickm
commit f7e8bc2b4bc0d6072a337d9420cd5cd395c9f9d2 Author: Nick Mathewson ni...@torproject.org Date: Fri Dec 12 08:54:07 2014 -0500 fix a long line --- src/or/rendservice.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index

[tor-commits] [tor-browser-bundle/master] Bug #13776: Incremental MAR files not reproducible

2014-12-12 Thread brade
commit 5130f4ded3705e13f2d20fe49a502ec11e8d7cf2 Author: Kathy Brade br...@pearlcrescent.com Date: Fri Dec 12 11:54:40 2014 -0500 Bug #13776: Incremental MAR files not reproducible Set the locale and umask to avoid differences across systems and users when generating incremental