[tor-commits] [tor-launcher/master] Bug 15145: Visually distinguish "proxy" and "bridge" screens.

commit c12448c935c9af9725664c27fd5a2fd4b45e5688 Author: Kathy Brade Date: Thu May 21 15:10:51 2015 -0400 Bug 15145: Visually distinguish "proxy" and "bridge" screens. Add the following titles to the bridge and proxy wizard pages: "Tor Bridges Configuration" "Local P

[tor-commits] [tor-launcher/master] Bump version to 0.2.7.6.

commit d35ac816112de384e8e21c1c390e4bc5c1468b7e Author: Kathy Brade Date: Wed Jun 10 10:28:33 2015 -0400 Bump version to 0.2.7.6. --- src/install.rdf |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index b2ca19c..2e9babc 100644 --- a

[tor-commits] [tor/release-0.2.6] Fix typo in 0.2.6.9 ChangeLog

commit 5dc6f758d60bf1aeca6cc3a1572c6052de14420e Author: Andrea Shepard Date: Wed Jun 10 14:43:31 2015 + Fix typo in 0.2.6.9 ChangeLog --- ChangeLog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0670977..ea4c86f 100644 --- a/ChangeLog

[tor-commits] [tor/release-0.2.6] Try writing a blurb

commit e8758dba8f7cb5aaedb16d02d3ccd8029b91b1b8 Author: Nick Mathewson Date: Wed Jun 10 10:50:15 2015 -0400 Try writing a blurb --- ChangeLog |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a17254..ad9e76b 100644 --- a/ChangeLog ++

[tor-commits] [tor/release-0.2.6] edit 0.2.6 changelog entries

commit f591ce17e8f456f21d61e2795ca8ed7cd4559100 Author: Nick Mathewson Date: Wed Jun 10 10:36:43 2015 -0400 edit 0.2.6 changelog entries --- ChangeLog | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea4c86f..5a17254 100644

[tor-commits] [tor/release-0.2.6] Yawning found a typo

commit 376171104c9187a7d5899df2cb58f64222c61145 Author: Nick Mathewson Date: Wed Jun 10 10:52:58 2015 -0400 Yawning found a typo --- ChangeLog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ad9e76b..e980c9a 100644 --- a/ChangeLog +++ b/Ch

[tor-commits] [tor/release-0.2.6] Bump version to 0.2.6.9

commit b616aea0740e05934fa23d15e127659ca06c2b15 Author: Andrea Shepard Date: Wed Jun 10 14:58:33 2015 + Bump version to 0.2.6.9 --- configure.ac|2 +- contrib/win32build/tor-mingw.nsi.in |2 +- src/win32/orconfig.h|2 +- 3 files chang

[tor-commits] [tor/release-0.2.6] Merge branch 'release-0.2.6' of ssh://git-rw.torproject.org/tor into release-0.2.6

commit 2f17b91ae2ca622294bf63dec2a6986756685702 Merge: b616aea 3761711 Author: Andrea Shepard Date: Wed Jun 10 14:59:13 2015 + Merge branch 'release-0.2.6' of ssh://git-rw.torproject.org/tor into release-0.2.6 ChangeLog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) __

[tor-commits] [tor/maint-0.2.6] Bump version to 0.2.6.9

commit 1eb2c0cbd3a9be2650419bd07474770629261f56 Author: Andrea Shepard Date: Wed Jun 10 14:58:33 2015 + Bump version to 0.2.6.9 --- configure.ac|2 +- contrib/win32build/tor-mingw.nsi.in |2 +- src/win32/orconfig.h|2 +- 3 files chang

[tor-commits] [tor/release-0.2.6] Bump version to 0.2.6.9

commit 1eb2c0cbd3a9be2650419bd07474770629261f56 Author: Andrea Shepard Date: Wed Jun 10 14:58:33 2015 + Bump version to 0.2.6.9 --- configure.ac|2 +- contrib/win32build/tor-mingw.nsi.in |2 +- src/win32/orconfig.h|2 +- 3 files chang

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

commit 0e939c1e0021b40491789a082eec8ddb422ecc2d Merge: 2f17b91 1eb2c0c Author: Andrea Shepard Date: Wed Jun 10 15:03:22 2015 + Merge branch 'maint-0.2.6' into release-0.2.6 ___ tor-commits mailing list tor-commits@lists.torproject.org https:/

[tor-commits] [tor/master] Update and clarify release checklist

commit 95bcd2dc151ba59fe3b9a4ae4725874cf67dc698 Author: Andrea Shepard Date: Wed Jun 10 15:05:52 2015 + Update and clarify release checklist --- doc/HACKING |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index 511e3fb..d94e0a9 1006

[tor-commits] [tor/master] Fix clang address of struct member always non-NULL in SSL master key

commit e870f6285d8c490536f62c6923ad0aca9844079d Author: teor Date: Thu Jun 11 01:06:15 2015 +1000 Fix clang address of struct member always non-NULL in SSL master key clang complains that the address of struct member in an assert in SSL_SESSION_get_master_key is always non-NULL

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug16343-master-key-assert'

commit a60d9023c34a2c77b2211bb213b165a0e5bd4439 Merge: 95bcd2d e870f62 Author: Nick Mathewson Date: Wed Jun 10 12:40:32 2015 -0400 Merge remote-tracking branch 'teor/bug16343-master-key-assert' src/common/tortls.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ___

[tor-commits] [tor/release-0.2.6] Pick a date; copy changelog to release notes

commit 5bf688ee0f91369db9459178102ec68ecd6579a4 Author: Nick Mathewson Date: Wed Jun 10 13:56:24 2015 -0400 Pick a date; copy changelog to release notes --- ChangeLog|2 +- ReleaseNotes | 39 +++ 2 files changed, 40 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] fwd-port 0.2.6.9 changes

commit 59b0272883b349603beca387811b899680f34a9a Author: Nick Mathewson Date: Wed Jun 10 13:58:20 2015 -0400 fwd-port 0.2.6.9 changes --- ChangeLog| 39 +++ ReleaseNotes | 39 +++ 2 files changed, 78 insertions(

[tor-commits] [tor/master] Spell occurred right

commit 09895d48c62404ebe60522e24e22e880c4472c65 Author: Nick Mathewson Date: Wed Jun 10 14:09:36 2015 -0400 Spell occurred right --- ChangeLog|2 +- ReleaseNotes |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 880fc88..a060eea 1

[tor-commits] [tor/release-0.2.6] Spell occurred right

commit d41ab97294ec69c748566f4cb610f899d9976572 Author: Nick Mathewson Date: Wed Jun 10 14:09:26 2015 -0400 Spell occurred right --- ChangeLog|2 +- ReleaseNotes |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9780c49..6ed406a 1

[tor-commits] [tor-messenger-build/master] Link libotr.dll statically

commit b4189c979bd605aa63db6a309bdb585cf71ce1b8 Author: Nicolas Vigier Date: Wed Jun 10 23:43:36 2015 +0200 Link libotr.dll statically --- projects/libgcrypt/build|2 +- projects/libgpg-error/build |2 +- projects/libotr/config |3 +++ 3 files changed, 5 insertions(+),

[tor-commits] [torspec/master] fix some spelling errors / etc in control spec

commit 236767d172c82472bd07ac71f75e0a9794f5a760 Author: Roger Dingledine Date: Wed Jun 10 22:37:42 2015 -0400 fix some spelling errors / etc in control spec --- control-spec.txt |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/control-spec.txt b/control-spec.txt

[tor-commits] [torspec/master] a stem user got confused by md/*

commit 3878865046ba97913c7e5f92aa3f061246d19307 Author: Roger Dingledine Date: Wed Jun 10 22:40:37 2015 -0400 a stem user got confused by md/* now try to phrase it in a less confusing way. --- control-spec.txt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --gi