[tor-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'pc/bug13091'

commit e21bb4837a7affd469e413a2664f4a2bb5c2de4e Merge: b5f07db 41b90ea Author: Georg Koppen g...@torproject.org Date: Thu Sep 11 10:38:02 2014 + Merge remote-tracking branch 'pc/bug13091' gitian/build-helpers/fix-info-plist.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor-browser-bundle/master] Bug 13091: Use Tor Browser everywhere (space included)

commit 41b90eae7d3d1a3664bc0d482862961a8ed3fcad Author: Kathy Brade br...@pearlcrescent.com Date: Wed Sep 10 09:52:33 2014 -0400 Bug 13091: Use Tor Browser everywhere (space included) Use TorBrowser instead Tor Browser in Info.plist on Mac OS. ---

[tor-commits] [tor-browser-bundle/master] No need to apply the patch for bug 8402 anymore.

commit 416e13ed4e32164d9fa56173cd517c4b2be45b6e Author: Georg Koppen g...@torproject.org Date: Thu Sep 11 13:10:53 2014 + No need to apply the patch for bug 8402 anymore. Bug 8402 landed on tor master recently which breaks compilation if we'd still apply the patch for it

[tor-commits] [tor/master] Fix comparison is always false warnings in new test_util_di_ops

commit d02937a20399a3b1c49a3503cabc5b07dc6b5e99 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 08:28:46 2014 -0400 Fix comparison is always false warnings in new test_util_di_ops Having a constant zero means that unsigned 0 is always false. --- src/test/test_util.c

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

commit 121f4a9ca43fa88282778adac4597fac8d9deafc Merge: 48558ed d02937a Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 08:30:41 2014 -0400 Merge remote-tracking branch 'public/bug13104_025' src/test/test_util.c | 16 ++-- 1 file changed, 10 insertions(+), 6

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

commit 2914d56ea4c767bbfa956afba64032c90a27f4eb Merge: 121f4a9 6215ebb Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 08:59:24 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug13124 |8 src/or/config.c |4 ++-- 2 files changed, 10

[tor-commits] [tor/master] Reduce log severity for unused ClientTransportPlugin lines

commit 6215ebb26676e3fa5d18ddce114f273d9a5dee2a Author: Roger Dingledine a...@torproject.org Date: Thu Sep 11 08:02:37 2014 -0400 Reduce log severity for unused ClientTransportPlugin lines Tor Browser includes several ClientTransportPlugin lines in its torrc-defaults file,

[tor-commits] [tor/maint-0.2.5] Reduce log severity for unused ClientTransportPlugin lines

commit 6215ebb26676e3fa5d18ddce114f273d9a5dee2a Author: Roger Dingledine a...@torproject.org Date: Thu Sep 11 08:02:37 2014 -0400 Reduce log severity for unused ClientTransportPlugin lines Tor Browser includes several ClientTransportPlugin lines in its torrc-defaults file,

[tor-commits] [tor/release-0.2.5] Reduce log severity for unused ClientTransportPlugin lines

commit 6215ebb26676e3fa5d18ddce114f273d9a5dee2a Author: Roger Dingledine a...@torproject.org Date: Thu Sep 11 08:02:37 2014 -0400 Reduce log severity for unused ClientTransportPlugin lines Tor Browser includes several ClientTransportPlugin lines in its torrc-defaults file,

[tor-commits] [tor/release-0.2.5] Correctly update channel local mark when address of incoming connection changes after handshake; fixes bug #12160

commit 39a017809b6e7f8f779cfa0b4ebea3c0209bef0c Author: Andrea Shepard and...@torproject.org Date: Fri Sep 5 11:08:46 2014 -0700 Correctly update channel local mark when address of incoming connection changes after handshake; fixes bug #12160 --- changes/bug12160 |4 +++

[tor-commits] [tor/release-0.2.5] In routerlist_assert_ok(), check r2 before taking (r2-cache_info)

commit 3c2c6a61163cd6a42cc09fc43200b9f08503 Author: Nick Mathewson ni...@torproject.org Date: Wed Sep 10 23:46:20 2014 -0400 In routerlist_assert_ok(), check r2 before taking (r2-cache_info) Technically, we're not allowed to take the address of a member can't exist relative

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

commit a9b2e5eac6168a1eb09da8d6d3ff43b08cc51411 Merge: 8eed82b a3fe8b1 Author: Nick Mathewson ni...@torproject.org Date: Wed Sep 10 22:12:47 2014 -0400 Merge remote-tracking branch 'public/bug12908_025' into maint-0.2.5 changes/bug12908 |4 src/or/config.c |7 +++ 2

[tor-commits] [tor/release-0.2.5] Warn if Tor is a relay and a HS

commit a3fe8b11663a32f1f007bd7cb0b9656825093544 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Mon Jul 21 21:16:58 2014 -0700 Warn if Tor is a relay and a HS Closes 12908; see #8742 --- changes/bug12908 |4 src/or/config.c |7 +++ 2 files

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

commit 8e7ee0e2c0cff0fc28479ebe6eca60cfb0f4f980 Merge: 351f245 6215ebb Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 09:08:50 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5 changes/bug12160 |4 +++ changes/bug12908 |4 +++

[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5

commit 8eed82b3d4bc8d15bd4ec7f229717f903dd6d6c7 Merge: dd22ab5 39a0178 Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 9 11:04:54 2014 -0400 Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5 changes/bug12160 |4 +++ src/or/channel.c | 17

[tor-commits] [tor/release-0.2.5] Fold changes entries into 0.2.5.7 changelog

commit 2fbaa2f9d6ff84ba9666e488ba662bd66818e42f Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 09:12:42 2014 -0400 Fold changes entries into 0.2.5.7 changelog --- ChangeLog| 17 + changes/bug12160 |4 changes/bug12908 |4

[tor-commits] [tor/master] Use tor_malloc_zero() in pt tests

commit 43a47ae7265e0030e0e275fbf01caf1c313710e3 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 09:17:13 2014 -0400 Use tor_malloc_zero() in pt tests Fixes for PT tests merged with 8402; patch from Yawning. --- src/test/test_pt.c |4 ++-- 1 file changed, 2

[tor-commits] [torsocks/master] Add cscope files to gitignore

commit 61beff8c974f9c96016baa9d691c3e5d86d0f1d9 Author: David Goulet dgou...@ev0ke.net Date: Tue Sep 9 16:17:55 2014 -0400 Add cscope files to gitignore Signed-off-by: David Goulet dgou...@ev0ke.net --- .gitignore |1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore

[tor-commits] [tor/release-0.2.5] Edit changelog a bit.

commit 102c7d7b2cfcacf2ed6dbab9a97a5a22fc775ea8 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 11:23:19 2014 -0400 Edit changelog a bit. --- ChangeLog | 27 +-- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog

[tor-commits] [tor/release-0.2.5] Remove bug12693 changelog entry.

commit 5958261f23188d449a5a3ef0753239ab334d5826 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 11:23:47 2014 -0400 Remove bug12693 changelog entry. It looks like this was stale and sitting around uncommitted in my changes directory, having not been committed on my

[tor-commits] [tor/release-0.2.5] Add a release blurb and increment the version in the changelog.

commit 76f72e3b41c7d4e149ec1a353de1f62048c4b234 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 11:33:36 2014 -0400 Add a release blurb and increment the version in the changelog. (Remember, this isn't the final release until it's tagged.) --- ChangeLog

[tor-commits] [tor/master] Update HACKING instructions to mention format_changelog script

commit b16254dce9fe8a4a2b96ecbb55489d55b0df163e Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 11:34:57 2014 -0400 Update HACKING instructions to mention format_changelog script --- doc/HACKING |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/HACKING

[tor-commits] [tor/master] Whitespace cleanups in transports/test_pt

commit 6d66e9068baa758cf12f34f1d07625d485264cf9 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 14:36:51 2014 -0400 Whitespace cleanups in transports/test_pt --- src/or/transports.c |2 +- src/test/test_pt.c |1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff

[tor-commits] [tor/master] Whitespace cleanups in test_util

commit 32f75c870e78611a456fed11351a19395d11673f Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 14:37:12 2014 -0400 Whitespace cleanups in test_util --- src/test/test_util.c | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git

[tor-commits] [tor/master] One more whitespace fix

commit 89e32c7c08ae039c8aed8a26189d561ae4dcba43 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 14:40:19 2014 -0400 One more whitespace fix --- src/test/test_util.c |1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index

[tor-commits] [tor/release-0.2.5] 0.2.5.7-rc is not the first release candidate for 0.2.5.7-rc

commit 40233cadbbbf77214913db818a1458c6ddd14a9f Author: Roger Dingledine a...@torproject.org Date: Thu Sep 11 20:26:38 2014 -0400 0.2.5.7-rc is not the first release candidate for 0.2.5.7-rc --- ChangeLog |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

[tor-commits] [tor/master] forward-port changelog from 0.2.5.7-rc

commit 383238b2f6d30120f1f5c9f99327c3194dbd0654 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 21:25:03 2014 -0400 forward-port changelog from 0.2.5.7-rc --- ChangeLog | 102 + 1 file changed, 102 insertions(+)

[tor-commits] r26948: {website} 0.2.5.7-rc tarball is up (in website/trunk: . include)

Author: arma Date: 2014-09-12 01:36:27 + (Fri, 12 Sep 2014) New Revision: 26948 Modified: website/trunk/Makefile website/trunk/include/versions.wmi Log: 0.2.5.7-rc tarball is up Modified: website/trunk/Makefile === ---

[tor-commits] [tor/maint-0.2.5] Bump maint-0.2.5 to 0.2.5.7-rc-dev

commit 550c03336ccc256dd9221d2cf9fdc5cef1f87908 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 21:38:32 2014 -0400 Bump maint-0.2.5 to 0.2.5.7-rc-dev --- configure.ac|2 +- contrib/win32build/tor-mingw.nsi.in |2 +- src/win32/orconfig.h

[tor-commits] [tor/master] Bump maint-0.2.5 to 0.2.5.7-rc-dev

commit 550c03336ccc256dd9221d2cf9fdc5cef1f87908 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 21:38:32 2014 -0400 Bump maint-0.2.5 to 0.2.5.7-rc-dev --- configure.ac|2 +- contrib/win32build/tor-mingw.nsi.in |2 +- src/win32/orconfig.h

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

commit 974f4d2ceb0c494bc5008749928bd2d49317cf0b Merge: 383238b 550c033 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 21:41:56 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' (Do an ours merge to avoid taking version number changes)

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

commit 396ac67f62de47648193b922122da65a392a1b98 Merge: 40233ca 550c033 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 21:44:03 2014 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 This is a theirs merge, to get the version number bumped to 0.2.5.7-rc-dev.

[tor-commits] [tor/release-0.2.5] Bump maint-0.2.5 to 0.2.5.7-rc-dev

commit 550c03336ccc256dd9221d2cf9fdc5cef1f87908 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 21:38:32 2014 -0400 Bump maint-0.2.5 to 0.2.5.7-rc-dev --- configure.ac|2 +- contrib/win32build/tor-mingw.nsi.in |2 +- src/win32/orconfig.h