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

[nickm]

commit 89f40ba97a752f125ef7dbb057d64dd5e06a95db
Merge: 2e0c22d58 7d845976e
Author: Nick Mathewson 
Date:   Thu Dec 21 10:58:20 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug24666   |  7 
 src/or/circuitmux.c| 34 +--
 src/or/circuitmux.h|  2 +-
 src/or/or.h| 15 +
 src/or/relay.c | 82 --
 src/or/relay.h |  8 +
 src/test/test_circuitmux.c | 12 +++
 7 files changed, 126 insertions(+), 34 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 2e0c22d58bbb16bb47fc36246116eec866e4b954
Merge: 5a8e90265 877dd1d6c
Author: Nick Mathewson 
Date:   Wed Dec 20 12:15:23 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-2017-12-06 | 4 +
 src/config/geoip | 12380 +++--
 src/config/geoip6|  3373 +---
 3 files changed, 10033 insertions(+), 5724 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 5a8e902651001f20a00da7c78e69842ed13180c3
Merge: b077ccde4 f7151387d
Author: Nick Mathewson 
Date:   Mon Dec 11 16:56:31 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug24167| 7 +++
 src/or/connection.c | 4 
 2 files changed, 11 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit b077ccde4e890110ddfa9304d5badf261a2942b9
Merge: 3ec72ef52 bc1ea4f47
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:13 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/ticket23856 | 4 
 src/or/rephist.c| 4 ++--
 src/or/router.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 3ec72ef52aa3fa9871335b1713e090e3677987d7
Merge: 235083308 f97f301b5
Author: Nick Mathewson 
Date:   Fri Dec 1 12:13:40 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug24480 | 3 +++
 src/or/rendservice.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 235083308add586c0b86b2e0ce8af7c9a7f4b5c0
Merge: f3c581ee2 dc3890439
Author: Nick Mathewson 
Date:   Fri Dec 1 09:35:43 2017 -0500

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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit fb47b90cc1e73f4d22d629c2fffe76d2488a7805
Merge: 6661c0352 ba4a9cf0c
Author: Nick Mathewson 
Date:   Thu Nov 30 12:07:59 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug24313 |  5 +
 changes/trove-2017-009   | 10 ++
 changes/trove-2017-011   |  8 
 changes/trove-2017-012-part1 |  6 ++
 src/common/crypto.c  | 16 +---
 src/or/rendservice.c |  8 +++-
 src/or/routerlist.c  |  5 -
 7 files changed, 53 insertions(+), 5 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 52bbd003fd4f509630f227655d1daeaf1707809e
Merge: fb47b90cc 6ee447254
Author: Nick Mathewson 
Date:   Thu Nov 30 12:28:39 2017 -0500

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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 6661c0352faf01460a0c3835ff342e6402796592
Merge: 28673a600 25c90230b
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 28673a600e09d52f941de80fabd1b4221d2f0f11
Merge: b5873fa77 d388f9d87
Author: Nick Mathewson 
Date:   Sat Nov 18 11:03:16 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug18329-minimal | 6 ++
 src/or/router.c  | 9 +
 2 files changed, 15 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit b5873fa7778bb3080f5bd38e34c8533da497362b
Merge: f4e033288 800797e7f
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit f4e033288e929c9e1cb2ca5b374b70cd363cff31
Merge: fd59766a9 c9b76a12f
Author: Nick Mathewson 
Date:   Sat Nov 11 12:23:33 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-2017-11-06 |4 +
 src/config/geoip | 9406 --
 src/config/geoip6|  848 -
 3 files changed, 6426 insertions(+), 3832 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit fd59766a9cf5853bce5fa884afed8c8a48ae16b8
Merge: cff872f51 faf568fa7
Author: Nick Mathewson 
Date:   Wed Oct 25 09:29:00 2017 -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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 2182bb827d271d9854ad0f93958933c4bee8899e
Merge: 99756033f 912ebf165
Author: Nick Mathewson 
Date:   Tue Oct 24 09:10:42 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 237aed037d37d4e75cdeb759830c38701df62726
Merge: 2d4983dcd a5f5bda46
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 2d4983dcd7e574cdf0c663e262ff83f7a99fb7ef
Merge: 15a7e24dc 8cc147aa8
Author: Nick Mathewson 
Date:   Mon Oct 23 09:06:34 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/ticket23910 | 3 +++
 src/or/config.c | 3 +++
 2 files changed, 6 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 15a7e24dcd7abd9c7e0a4721522d8513a00348e1
Merge: 2f9032f1c 9a1b38546
Author: Nick Mathewson 
Date:   Mon Oct 23 08:59:11 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/longclaw_23592 | 3 +++
 src/or/config.c| 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 2f9032f1cc6a48b0f107e4479d2c2849d7b7d177
Merge: bad224df8 6f87a8589
Author: Nick Mathewson 
Date:   Mon Oct 23 08:53:24 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug23690 | 5 +
 src/or/circuitlist.c | 1 +
 2 files changed, 6 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit bad224df85236956708183ff00d0d6bd94dc46ae
Merge: adec001c9 91c17ffbd
Author: Nick Mathewson 
Date:   Thu Oct 5 11:04:59 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-october2017 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit adec001c9a1e173e647b9b74ee4fb82871f86cb3
Merge: 254535a14 d6bdec159
Author: Nick Mathewson 
Date:   Thu Oct 5 11:03:35 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-october2017 |4 +
 src/config/geoip  | 8683 +++--
 src/config/geoip6 |  653 ++--
 3 files changed, 5654 insertions(+), 3686 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 254535a14225be71cc5652032051d5c5cd28eb01
Merge: 9eaa66db0 8e52c4658
Author: Nick Mathewson 
Date:   Wed Sep 20 08:32:55 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/longclaw-ipv6 | 6 ++
 src/or/config.c   | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 9eaa66db0b2114401f3748c65222c373617e5c0e
Merge: e25e98028 0a72d1c8f
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:55 2017 -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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 7cab15eabc9eebaf4e26bcfb7016ac19c8bc1a7e
Merge: 8d34a6ea9 0ec72b030
Author: Nick Mathewson 
Date:   Mon Sep 18 09:40:40 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/trove-2017-008 | 5 +
 src/or/rendservice.c   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 8d34a6ea9c7dae39b3e6066e9c207346f58ebf70
Merge: e38b0c2eb 26f68dfce
Author: Nick Mathewson 
Date:   Thu Sep 14 13:22:17 2017 -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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 6e37ba5543fc0351fe10709bd16cdfddae1de479
Merge: fa22cc651 bcf2b413c
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit fa22cc651461b05f4c421e82f85d59f55e7c631d
Merge: 14f3f8e34 93b28972c
Author: Nick Mathewson 
Date:   Thu Aug 3 08:44:31 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-august2017 | 4 +
 src/config/geoip | 10796 -
 src/config/geoip6|   607 ++-
 3 files changed, 7161 insertions(+), 4246 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 14f3f8e341f53d4d703d05a24aab855926845c87
Merge: 6d3b80819 0e7558ab6
Author: Nick Mathewson 
Date:   Tue Aug 1 11:19:29 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-july2017 | 4 +
 src/config/geoip   | 10075 ---
 src/config/geoip6  |   694 +++-
 3 files changed, 7530 insertions(+), 3243 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 6d3b808198b2281a470bd85df5e16d07bf88fcbc
Merge: 1ee8ed4b6 5c5eb0f09
Author: Nick Mathewson 
Date:   Wed Jul 26 15:39:55 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 1ee8ed4b63859313a8b720bb91f60375f7f26aad
Merge: 5c64d56a4 fbf93614c
Author: Nick Mathewson 
Date:   Wed Jul 26 15:38:48 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 .travis.yml  | 88 
 changes/bug22636 |  8 ++
 2 files changed, 96 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 5c64d56a4144d6642288a224a4dcbd06f30ec03a
Merge: 8f6e897 48e45e2
Author: Nick Mathewson 
Date:   Fri Jul 7 10:55:57 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug22838_028  | 5 +
 src/test/test_switch_id.c | 1 +
 2 files changed, 6 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 8f6e89754b81fcc01c203bdb49f38ffc19bc4918
Merge: 19ed669 c1e4aff
Author: Nick Mathewson 
Date:   Fri Jul 7 10:51:28 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug22789 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 19ed6697490d6895f5c3afd6020a186667125919
Merge: 963324c 5ff0f1a
Author: Nick Mathewson 
Date:   Wed Jul 5 13:43:31 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug22789 | 6 ++
 src/common/compat.c  | 8 ++--
 src/test/test_addr.c | 9 +
 3 files changed, 21 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 963324cf2accfc424df5fde902299449abf9093c
Merge: f7503fb 3483f7c
Author: Nick Mathewson 
Date:   Tue Jun 27 11:04:44 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug22737   | 12 
 src/or/connection_or.c |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit f7503fb1a5c9a1f4e765d8c7d31613b4e7c138c2
Merge: 153a0b2 307be8d
Author: Nick Mathewson 
Date:   Fri Jun 9 09:58:45 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-june2017 |4 +
 src/config/geoip   | 5079 +---
 src/config/geoip6  | 1952 +--
 3 files changed, 4449 insertions(+), 2586 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 153a0b278f1592d4a0f6c23a82a34a36929e8b0d
Merge: 64ac28e 6e90d75
Author: Nick Mathewson 
Date:   Thu Jun 8 14:06:57 2017 -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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 4ab3fe6d26246ea5cb0c10bc8610b8fcb88c11cc
Merge: 3ce0237 bff08ed
Author: Nick Mathewson 
Date:   Thu Jun 8 09:29:49 2017 -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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 3ce02372d65c3edc83fbc9ff47d6fa80a76a6e18
Merge: fe3b7e1 d15d09a
Author: Nick Mathewson 
Date:   Thu Jun 8 09:21:15 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/trove-2017-005 | 7 +++
 src/or/relay.c | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit fe3b7e15b52e5882aabc75a0cd1d986c5b872130
Merge: 33b5008 d850d27
Author: Nick Mathewson <ni...@torproject.org>
Date:   Mon Jun 5 14:48:30 2017 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

_______
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 33b500851c3476298f4a243374216258a4cf56e8
Merge: df842d8 33fcc0f
Author: Nick Mathewson 
Date:   Mon Jun 5 12:01:27 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug22490 | 3 +++
 src/or/geoip.c   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit df842d84a8879a976401ea57bc435497ef6d234e
Merge: 1e4a5dc 5b45d73
Author: Nick Mathewson 
Date:   Tue May 16 08:38:53 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/ticket21564  |   6 ++
 src/or/fallback_dirs.inc | 179 +--
 2 files changed, 69 insertions(+), 116 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 1e4a5dc9d18a3bed67f93c72bbadc8b479a61525
Merge: 7758c66 dc34cd7
Author: Nick Mathewson 
Date:   Mon May 8 08:08:26 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-may2017 |4 +
 src/config/geoip  | 5862 +++--
 src/config/geoip6 |  689 +-
 3 files changed, 4358 insertions(+), 2197 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 7758c66b3116c23c6a6d24bb905ca4ddaef152bc
Merge: d602198 91c6b18
Author: Nick Mathewson 
Date:   Thu Apr 6 08:32:56 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-april2017 | 4 +
 src/config/geoip| 14366 +-
 src/config/geoip6   |   677 ++-
 3 files changed, 9792 insertions(+), 5255 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit d6021989d9a4562a5a1a3f65ba3ac45178921fe9
Merge: 4e5df73 2cfecec
Author: Nick Mathewson 
Date:   Wed Mar 8 10:11:58 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-march2017 | 4 +
 src/config/geoip| 13115 +++---
 src/config/geoip6   |   754 ++-
 3 files changed, 5884 insertions(+), 7989 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 42e925353c1fce9828765634a83c318cab2d89aa
Merge: f5951b7 f93bcab
Author: Nick Mathewson 
Date:   Tue Feb 28 10:38:19 2017 -0500

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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit a33d9f9b2b74da38f560dd971cab048ae5ad0a69
Merge: 383fdec 5222054
Author: Nick Mathewson 
Date:   Wed Feb 15 07:53:13 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug20384 | 10 --
 1 file changed, 10 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 383fdeca124d416eb4256feab4e0b8d02380c248
Merge: d309d28 1ebdae6
Author: Nick Mathewson 
Date:   Wed Feb 15 07:50:58 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug20384 | 10 ++
 changes/trove-2017-001.2 |  8 
 src/or/routerparse.c | 49 +---
 3 files changed, 48 insertions(+), 19 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit d309d28ca5dc63d73c7247d813f489921b8581ab
Merge: 1243c10 9b90d51
Author: Nick Mathewson 
Date:   Mon Feb 13 14:39:21 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-february2017 | 4 +
 src/config/geoip   | 10832 ---
 src/config/geoip6  |  1651 ++-
 3 files changed, 7351 insertions(+), 5136 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 1243c1000cdcfd4edf414ff8a14e34ea15aa2cef
Merge: 5f84409 eca4a89
Author: Nick Mathewson <ni...@torproject.org>
Date:   Tue Feb 7 10:39:56 2017 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

_______
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 5f8440981aa0cabd5dfda8f0515c4a42e185f5ab
Merge: 9583b34 a9f936d
Author: Nick Mathewson <ni...@torproject.org>
Date:   Tue Feb 7 09:30:36 2017 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

_______
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 9583b34a40e6fb1a4ace9aa36a6c7cacc35b0d5f
Merge: bee3a46 b60fb3a
Author: Nick Mathewson <ni...@torproject.org>
Date:   Tue Feb 7 09:21:19 2017 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

_______
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit bee3a46c977018e1e9e8a07e7b1bbfe0238e6f8d
Merge: c02646b 93ea18e
Author: Nick Mathewson <ni...@torproject.org>
Date:   Tue Feb 7 08:56:47 2017 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

_______
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit c02646b8f0318b93eeb41306d53c5037a30edd53
Merge: 0691fed 7b24f3e
Author: Nick Mathewson <ni...@torproject.org>
Date:   Tue Feb 7 08:41:41 2017 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

_______
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 0691feda265a954436cd3635cbe4149bff7e6a1a
Merge: 17f20c7 c77ace6
Author: Nick Mathewson 
Date:   Wed Jan 11 09:13:24 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-january2017 |4 +
 src/config/geoip  | 3160 +
 src/config/geoip6 |  561 +++-
 3 files changed, 2552 insertions(+), 1173 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 17f20c7b3f385db6bec4ee8f32f050f7953fbcca
Merge: 5d63ceb cb2e205
Author: Nick Mathewson <ni...@torproject.org>
Date:   Tue Dec 20 18:23:49 2016 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

_______
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 5d63ceb25cfd7c6cf10cd56e229cf233cdf8987d
Merge: c59e04b 7f55aaf
Author: Nick Mathewson <ni...@torproject.org>
Date:   Tue Dec 20 18:15:45 2016 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

_______
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit c59e04b51188a5bf3c57a9182a04feb9ace51d4d
Merge: 9b3b49f f62c74c
Author: Nick Mathewson 
Date:   Mon Dec 19 10:12:17 2016 -0500

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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit fe7a0c34b05db5f4a8a91353c1615ab9cde33095
Merge: 5d68e5b b838e1f
Author: Nick Mathewson 
Date:   Mon Dec 19 08:07:37 2016 -0500

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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 5d68e5b8fcf5c807cbf0d3d65a3bb6b181faea0d
Merge: 592cc50 c11de4c
Author: Nick Mathewson 
Date:   Mon Dec 19 08:01:27 2016 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug21018 | 11 +++
 src/or/rendcache.c   |  4 +++-
 src/or/routerparse.c |  6 +++---
 3 files changed, 17 insertions(+), 4 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 6a00e703a2044c2f2a830cbfbd885c2c1cdad713
Merge: 9a998e1 e030632
Author: Nick Mathewson 
Date:   Mon Dec 19 07:30:30 2016 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/ticket20170-v3   |   5 +
 src/or/fallback_dirs.inc | 392 ---
 2 files changed, 272 insertions(+), 125 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 9a998e1d0fa30c7f3e35d529d639a8f0dd199d4f
Merge: b58faf1 56a2b8d
Author: Nick Mathewson 
Date:   Fri Dec 9 08:35:02 2016 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-december2016 |4 +
 src/config/geoip   | 6259 ++--
 src/config/geoip6  | 1193 -
 3 files changed, 4705 insertions(+), 2751 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit b58faf1717fafbe6d6528f4ba65fc1a612721069
Merge: 31e7b47 d47c52b
Author: Nick Mathewson 
Date:   Thu Dec 8 11:02:57 2016 -0500

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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 31e7b47fbebe8cafd9dc1c930cc85585116cdc0f
Merge: ba5f3d5 9c899da
Author: Nick Mathewson <ni...@torproject.org>
Date:   Thu Dec 8 09:07:41 2016 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

_______
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit c4a91e04247bfb2b6c61616a4c41a00223487464
Merge: 7968bab 4732e15
Author: Nick Mathewson 
Date:   Thu Dec 8 09:04:44 2016 -0500

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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 212d984dc50668adbbd770d4af9185ca8bcaefbf
Merge: 5b336f2 cc34ba1
Author: Nick Mathewson 
Date:   Mon Dec 5 10:06:25 2016 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug20865| 7 +++
 src/common/crypto.c | 9 +
 2 files changed, 16 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 5b336f2e0b792b2927b1d3bdc521d81221c5e157
Merge: eede3a1 2a36541
Author: Nick Mathewson 
Date:   Mon Dec 5 08:04:04 2016 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug20588 | 3 +++
 src/common/aes.c | 9 -
 2 files changed, 11 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit eede3a171a2b07b49270c1494576c2823ea8b6e2
Merge: 74d0918 1122137
Author: Nick Mathewson 
Date:   Fri Dec 2 11:19:59 2016 -0500

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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit fb739ac5764e9da72622e55283d41c1136ee1067
Merge: 18ee1d2 9157405
Author: Nick Mathewson 
Date:   Thu Dec 1 13:34:29 2016 -0500

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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 2cc900e74acd59ac5250b0b58f3b3f6a06665e2e
Merge: 91f06ba 16fcbd2
Author: Nick Mathewson 
Date:   Thu Dec 1 10:05:38 2016 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug20235 |  4 
 configure.ac | 30 --
 2 files changed, 32 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 91f06ba2806cf4f1d714072aee8b9f069dc61d92
Merge: 5d0237f 2639fd0
Author: Nick Mathewson 
Date:   Mon Nov 7 09:31:47 2016 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-november2016 |4 +
 src/config/geoip   | 4025 
 src/config/geoip6  | 2490 ++-
 3 files changed, 3407 insertions(+), 3112 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 5d0237ff232ac857ddc360dadb6c8baa79f0e01d
Merge: 2ba047f 61bdc45
Author: Nick Mathewson 
Date:   Thu Nov 3 18:36:37 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug20551| 3 +++
 src/common/tortls.c | 8 
 2 files changed, 7 insertions(+), 4 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 2ba047f596e401b294e356e8b89b70cde10c0948
Merge: 6520ef5 7a45ef5
Author: Nick Mathewson 
Date:   Thu Nov 3 15:44:40 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19969 | 10 ++
 src/or/connection_edge.c |  9 +
 src/or/main.c| 31 +++
 src/or/main.h|  2 ++
 4 files changed, 44 insertions(+), 8 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 6520ef5478731ef9a2a38d274f0840d9c26598ba
Merge: badc444 9b18b21
Author: Nick Mathewson 
Date:   Thu Nov 3 15:40:56 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug20553| 3 +++
 src/common/crypto.c | 5 ++---
 src/tools/tor-gencert.c | 5 ++---
 3 files changed, 7 insertions(+), 6 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit badc444f7adce748fd4c4171a3748fc08f001022
Merge: 44c5fc6 b0f1241
Author: Nick Mathewson 
Date:   Mon Oct 17 16:32:17 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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 4d1e39b21b961c574a8832d2698c66dc0f9614fa
Merge: d579528 1df1143
Author: Nick Mathewson 
Date:   Mon Oct 17 14:51:29 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/buf-sentinel | 11 +++
 src/or/buffers.c | 40 
 2 files changed, 43 insertions(+), 8 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 3e920a3468f5c99bff6a3045133f001a1871d0fe
Merge: 4d1e39b 0fa3811
Author: Nick Mathewson 
Date:   Mon Oct 17 14:57:33 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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit d579528033837f56f341ffc624282d1ccf819982
Merge: c043398 ab98c43
Author: Nick Mathewson 
Date:   Thu Oct 6 10:01:23 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-october2016 | 4 +
 src/config/geoip  | 63919 +---
 src/config/geoip6 |  1496 +-
 3 files changed, 48664 insertions(+), 16755 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit c04339810badd64f7bec9cf9f1716a9f37c58630
Merge: da84aec ec19ecc
Author: Nick Mathewson 
Date:   Fri Sep 23 15:58:14 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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 89e4126cd9cb438727756b0c577d3b08a4af6482
Merge: 53d4c50 db6153e
Author: Nick Mathewson 
Date:   Fri Sep 23 09:30:48 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/broken-028-fallbacks | 3 +++
 src/or/fallback_dirs.inc | 6 --
 2 files changed, 7 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 53d4c505cda3e129092366f863ce16a4ad192cfa
Merge: 31df6a7 ad1824f
Author: Nick Mathewson 
Date:   Thu Sep 22 15:37:12 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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 7df4f23d952f892c09f5ef930e9e4f297f784cce
Merge: caa16bf d78711c
Author: Nick Mathewson 
Date:   Thu Sep 22 15:20:19 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug20203 |  6 ++
 src/or/circuitlist.c | 10 --
 src/or/relay.c   |  9 +
 3 files changed, 23 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit caa16bffc75b8e36ae3f834c52e9b107513e263f
Merge: a8b607b 1edea87
Author: Nick Mathewson 
Date:   Thu Sep 22 09:00:23 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug20103| 2 +-
 changes/geoip-september2016 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit a8b607bfddd1acf2896cb12dd80389e4b1d66a24
Merge: f527a80 9ebe202
Author: Nick Mathewson 
Date:   Tue Sep 20 19:30:38 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug20103   |  7 +++
 src/or/networkstatus.c | 24 +---
 2 files changed, 20 insertions(+), 11 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit f527a809b3adbb1379465f2c5c7238502c2f3877
Merge: 8a163e9 19a9872
Author: Nick Mathewson 
Date:   Tue Sep 20 19:29:03 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 src/or/fallback_dirs.inc | 46 ++
 1 file changed, 30 insertions(+), 16 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 8a163e95793dc44860c992dbcf922f249017d2a3
Merge: 06b9f75 6494f33
Author: Nick Mathewson 
Date:   Wed Sep 7 13:54:46 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-september2016 | 4 +
 src/config/geoip| 30846 +-
 src/config/geoip6   |  2373 ++--
 3 files changed, 10566 insertions(+), 22657 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 06b9f75f3ee435c8bfe5148ffb13f7c0e23d8af3
Merge: 2630886 e9124b8
Author: Nick Mathewson 
Date:   Wed Aug 24 14:46:13 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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 82957bf91ae6326b82fb3bb5ce8107f64c2d41ae
Merge: 46e2c15 57ba7ab
Author: Nick Mathewson 
Date:   Wed Aug 24 11:02:17 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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 041947977ec9b0b3efc54e10a9fde8f209e0ddad
Merge: 824b160 5280a70
Author: Nick Mathewson 
Date:   Wed Aug 24 10:44:21 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19973  |  6 ++
 src/or/circuitbuild.c |  9 +++--
 src/or/or.h   |  5 -
 src/or/routerlist.c   | 14 --
 src/or/routerlist.h   |  2 +-
 5 files changed, 26 insertions(+), 10 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 824b1609313d8e055c2a733da1a0c3b5d6df24af
Merge: fa038eb d3a975e
Author: Nick Mathewson 
Date:   Wed Aug 24 10:03:29 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19728 | 3 +++
 src/or/config.c  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit e085b11d27f3396e0fd49156d74245594fd4eb88
Merge: 6e181ba 0ba0531
Author: Nick Mathewson 
Date:   Mon Aug 22 10:19:52 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19947| 4 
 src/or/routerlist.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 6e181bafff0b62688bae02998784a8e4b7f2167d
Merge: ee47010 65cf513
Author: Nick Mathewson 
Date:   Fri Aug 19 19:35:52 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19903 | 4 +
 changes/geoip-august2016 | 4 +
 src/common/tortls.c  | 2 +-
 src/config/geoip | 14009 +
 src/config/geoip6|  1108 +++-
 5 files changed, 8587 insertions(+), 6540 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit ee47010e605e2d4c096d7fa8ebb81ddfc07d78c4
Merge: 4d21754 6b740aa
Author: Nick Mathewson 
Date:   Tue Aug 2 11:13:51 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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 176a57fd4ce652788725c9ad514223d7dd263af4
Merge: 7ebcc1b 11386eb
Author: Nick Mathewson 
Date:   Fri Jul 29 11:17:35 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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 258988ca51bab7414aefb621532cf078eda18dab
Merge: 845d3fe 1c4a2dd
Author: Nick Mathewson 
Date:   Fri Jul 29 10:23:29 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19782 |3 +
 changes/geoip-july2016   |4 +
 scripts/maint/fallback.blacklist |3 +
 scripts/maint/fallback.whitelist |3 -
 src/common/sandbox.c |1 -
 src/config/geoip | 4615 ++
 src/config/geoip6|  982 +---
 src/or/fallback_dirs.inc |8 +-
 8 files changed, 3890 insertions(+), 1729 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit fe53f9c17d2e4f92db81d9b4e801ae45dbe4db08
Merge: 449c61f fbae15a
Author: Nick Mathewson 
Date:   Sun Jul 17 13:54:58 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19660|  8 
 changes/bug19682|  3 +++
 src/common/sandbox.c| 30 +++---
 src/test/test_util_format.c |  8 
 4 files changed, 30 insertions(+), 19 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 449c61f452db7a0736a0654ce3290ce0ea76cd40
Merge: 35a5a1b c1bfa65
Author: Nick Mathewson 
Date:   Wed Jul 13 09:19:29 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug18397 |  7 +++
 src/common/sandbox.c | 20 
 2 files changed, 27 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 5a64f42f91bf4371903cecc34fe8118fae0a4aad
Merge: a5b953a a931d15
Author: Nick Mathewson 
Date:   Thu Jul 7 12:43:59 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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 8e633d06435e4b78f0ec45ba3b5d81d25aae1d3f
Merge: 3a6cbde b167e82
Author: Nick Mathewson 
Date:   Wed Jul 6 10:17:16 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19608  |  6 ++
 src/or/policies.c | 36 +++-
 2 files changed, 21 insertions(+), 21 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 1992ed67563f110c2fe87a97e5a03d1a442bdfa5
Merge: c174f06 8f44d28
Author: Nick Mathewson 
Date:   Tue Jul 5 13:05:42 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| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit aeb95c20919dbff13ee936fea7fda4a63a11f918
Merge: 6220cd1 717eae3
Author: Nick Mathewson 
Date:   Tue Jul 5 12:58:18 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19499 | 2 +-
 changes/bug19556 | 2 +-
 changes/bug19557 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

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(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits