commit 6220cd13c517f18c8a1cb1c5bc350f3e2a7eafac
Merge: e512e6c e99cc87
Author: Nick Mathewson
Date: Tue Jul 5 12:52:24 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
src/test/test_config.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
_
commit e512e6ca59ff86852e29ffe6fbb9d2bdb8688e82
Merge: 803fa75 8d25ab6
Author: Nick Mathewson
Date: Tue Jul 5 12:43:13 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/asciidoc-UTC | 4
changes/bug19556 | 7 +++
changes/bug19557 | 4
doc/asciido
commit 803fa75f7f5a8bc5b94aebfc5be81d5a05d679b4
Merge: 0172450 f440874
Author: Nick Mathewson
Date: Tue Jul 5 12:23:35 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
src/or/config.c | 5 -
1 file changed, 5 deletions(-)
___
tor-co
commit 017245074e3a2c1c7ad4375911a586367e036b04
Merge: 34879d0 744077d
Author: Nick Mathewson
Date: Fri Jul 1 09:54:01 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/bug18849| 4
src/or/routerlist.c | 18 --
2 files changed, 12 insertions(+), 10
commit 34879d0a4b47815af413d169fbbde0162068bb00
Merge: 87ea2b6 2c9354f
Author: Nick Mathewson
Date: Tue Jun 28 19:15:32 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/ticket19071-19480 | 3 ++
scripts/maint/fallback.whitelist| 4 +--
scripts/maint/updateF
commit 5b57f88f6097e92a052cd8d381587cee1dea6006
Merge: cc6fcbd 0116eae
Author: Nick Mathewson
Date: Mon Jun 27 13:20:57 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/bug19499 | 4
src/common/crypto.c | 24
src/tools/tor-checkk
commit 87ea2b6655d43ab95becf681e26a2092db17161e
Merge: 5b57f88 bc9a0f8
Author: Nick Mathewson
Date: Tue Jun 28 11:22:39 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/bug18812 | 4
src/or/connection_or.c | 51 +-
commit cc6fcbde4ea11ef66a9e0c3fe62d007491f8cb22
Merge: cf13189 421a7c8
Author: Nick Mathewson
Date: Wed Jun 22 08:19:51 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/ticket19071-19480 | 10 +
scripts/maint/fallback.blacklist| 41 ---
sc
commit cf131890643a6db64e39dee7ef1d7fef3d19b16c
Merge: a839ed5 b432efb
Author: Nick Mathewson
Date: Tue Jun 21 09:00:37 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/bug19464 | 6 ++
src/or/rendservice.c | 2 --
2 files changed, 6 insertions(+), 2 deletions(-)
commit a839ed5cc1e12aa096191909e67c715f0863a20a
Merge: b673f7e f038e9c
Author: Nick Mathewson
Date: Tue Jun 21 08:54:39 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/bug19454 | 3 +++
src/or/main.c| 12 +---
2 files changed, 12 insertions(+), 3 deletions(-)
commit 61d795f856ea539d38d36cf7e414b070d9551078
Merge: fa6a228 e718a58
Author: Nick Mathewson
Date: Wed Jun 15 12:55:26 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h
commit fa6a228ce86c2737447f32c78eedc00083eb826c
Merge: 1cdb839 3a0d42f
Author: Nick Mathewson
Date: Tue Jun 14 20:36:40 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h
commit 1cdb839108ef7487aaa516ab003d1afd7abfecc6
Merge: 299f892 d6b0121
Author: Nick Mathewson
Date: Tue Jun 14 20:21:32 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
src/common/aes.c | 22 ++
src/common/crypto.c | 21 +
src
commit b74ce86830ca742f994e348c4bb4aed40ac81662
Merge: 1dbb5aa 71aacbe
Author: Nick Mathewson
Date: Tue Jun 14 12:23:00 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/bug19406 | 4 ++
src/common/crypto.c | 182 ++
commit 876032555030d9a443a343261cbf97a10319cf19
Merge: ef87106 60b8aae
Author: Nick Mathewson
Date: Mon Jun 13 13:57:09 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/bug19213 | 2 +-
changes/geoip-jun2016 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit ef8710658322724a2bf2da698593c9cb966a8d2e
Merge: 2728a12 2ee3dbe
Author: Nick Mathewson
Date: Mon Jun 13 10:49:15 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/geoip-jun2016 |4 +
src/config/geoip | 3349 +++--
commit 2728a12232cf3e93986493488a4042e02f704f30
Merge: 399eebe ada5668
Author: Nick Mathewson
Date: Sat Jun 11 10:16:36 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/bug19203 | 4
src/or/nodelist.c | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
__
commit 399eebea5480f9515e8a9cd204cd8c5b0dc544db
Merge: dc624a7 6eeedc0
Author: Nick Mathewson
Date: Mon Jun 6 10:17:57 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/bug19191 | 5 +
changes/bug19213 | 3 +++
src/or/routerlist.c | 2 +-
src/test/test_util.c |
commit dc624a7db11b618d858149e68f9f2114a9d17713
Merge: d7b843c f258064
Author: Nick Mathewson
Date: Thu May 26 21:09:09 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h
commit c90f808ebc3af50d6408e6c1d8eed819536263e7
Merge: fc4a3b3 0a74346
Author: Nick Mathewson
Date: Thu May 26 12:29:51 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
___
tor-commits mailing list
tor-commits@lists.torproject.org
https:/
commit fc4a3b30c8e329d408eb2e6bd922f5cb8a5ff10b
Merge: cd12ee6 a873ba8
Author: Nick Mathewson
Date: Thu May 26 12:12:41 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
src/or/router.c | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
_
commit 3e2d061397f451ba7b818d9b5b407523b2be4b89
Merge: e32281b 36b2b48
Author: Nick Mathewson
Date: Wed May 25 16:58:58 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/bug18668 | 3 +++
src/test/testing_common.c | 3 ++-
2 files changed, 5 insertions(+), 1 deleti
commit e32281b00095dbc764e995cf57290c9c1b0c9660
Merge: 693e48a f2d614c
Author: Nick Mathewson
Date: Wed May 25 16:12:10 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
src/or/routerlist.c | 22 +++---
1 file changed, 15 insertions(+), 7 deletions(-)
_
commit 9d199893feabefc6fcc6849f939ec5cd4d8891b8
Merge: b5e2b38 6d375f1
Author: Nick Mathewson
Date: Wed May 25 10:21:04 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/bug19161| 3 +++
configure.ac| 1 +
src/common/crypto_s2k.c | 2 +-
s
commit 0f80dd2a26333ee78a9698b4d3cf8079736f34b5
Merge: fd34049 87134db
Author: Nick Mathewson
Date: Mon May 23 11:06:22 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
.gitignore | 3 ---
1 file changed, 3 deletions(-)
___
tor-commits
commit fd34049f3d565e906d4c1e9b73332f61ebfe7673
Merge: f282488 50cbf22
Author: Nick Mathewson
Date: Fri May 20 10:46:45 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
src/or/routerlist.c | 2 ++
1 file changed, 2 insertions(+)
___
tor
commit f2824887e326e9fdc5f096f99d4dfe4aeee4d79a
Merge: 945aa99 33841a6
Author: Nick Mathewson
Date: Thu May 19 16:05:04 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
src/or/networkstatus.c | 6 +-
src/test/test_connection.c | 20 +---
2 files changed, 1
commit 945aa9931112c02f5e50594915509b471897684c
Merge: 2b8ba55 0d6f293
Author: Nick Mathewson
Date: Thu May 19 15:56:45 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
src/or/dirserv.c | 17 +++---
src/or/dirvote.c | 7 +++---
src/or/or.h
commit 0a05afa96dde84b010c87546ba49a801df92ab40
Merge: c4b7b4a dd17df2
Author: Nick Mathewson
Date: Thu May 19 08:54:30 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/bug18809 | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
__
commit 1e97b6afc62388a6835d92c6fc9543cfa8caf964
Merge: ef03dc0 9f217c8
Author: Nick Mathewson
Date: Thu May 19 08:17:11 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/bug17150 | 7 +
changes/bug18809 | 14 ++
src/or/circuituse.c| 19 +++
s
commit c4b7b4ad4ba35b724fa90012adafd62e48ed7e42
Merge: 1e97b6a 7c7d990
Author: Nick Mathewson
Date: Thu May 19 08:29:52 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/bug18809| 2 +-
src/test/test_dir.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
__
101 - 131 of 131 matches
Mail list logo
