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

[nickm]

commit d07e069c97ac5f9e0c9a593b7ec84c540b310f0f
Merge: b2b59b06c b39c50cde
Author: Nick Mathewson 
Date:   Fri Jan 19 16:30:53 2018 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug24895 |  8 
 src/or/rendservice.c | 26 --
 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit b2b59b06c8a2d548453302413241d7f663f6c39c
Merge: 2ffdf43e7 1cf11b694
Author: Nick Mathewson 
Date:   Fri Jan 19 10:18:59 2018 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 .travis.yml | 24 +---
 1 file changed, 21 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 2ffdf43e705d416142683c414fbc18f937834cdc
Merge: f3ea41211 b85fa0bd5
Author: Nick Mathewson 
Date:   Mon Jan 8 11:10:36 2018 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/ticket_24801 |   5 +
 src/or/fallback_dirs.inc | 968 ++-
 2 files changed, 717 insertions(+), 256 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit f3ea412110dea8f621c0b67706ba024a023c76a6
Merge: 7c411bba8 8042c356f
Author: Nick Mathewson 
Date:   Mon Jan 8 09:34:56 2018 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/geoip-2018-01-05 | 4 +
 src/config/geoip | 31441 ++---
 src/config/geoip6|   753 +-
 3 files changed, 7587 insertions(+), 24611 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 7c411bba8a81b545e377af18ecd47f7de23a2dbc
Merge: 72c2292ef 16fd975a8
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 72c2292efc916a9da007108d8d019765238bb225
Merge: 698e4a478 bbc9ff160
Author: Nick Mathewson 
Date:   Wed Jan 3 08:59:59 2018 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug24633  | 5 +
 src/ext/timeouts/timeout-bitops.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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 698e4a4780a717083e713ee0cf1f3a744f7087d7
Merge: bcf033047 8a7767603
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit bcf033047d80214b453327532910969b72b72c05
Merge: 1fe6e318f 03b4dd92a
Author: Nick Mathewson 
Date:   Thu Dec 21 10:58:20 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug24666   |  7 
 src/or/circuitmux.c| 34 ++--
 src/or/circuitmux.h|  2 +-
 src/or/or.h| 15 +
 src/or/relay.c | 79 --
 src/or/relay.h |  8 +
 src/test/test_circuitmux.c | 12 +++
 7 files changed, 123 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 1fe6e318f1d7972a84942b916e490cc47186afbe
Merge: 1ff7c6075 08ed0d793
Author: Nick Mathewson 
Date:   Wed Dec 20 12:15:24 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit ad3b01e056293b23160654d2e54c6d1ddf62242a
Merge: e11830b2b da38904ef
Author: Nick Mathewson 
Date:   Mon Dec 11 16:56:31 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 1ff7c60759d7d02fa0d029f4014e8b4e1b3cc368
Merge: ad3b01e05 d3b7a2bd2
Author: Nick Mathewson 
Date:   Tue Dec 12 09:13:12 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/{bug23682 => bug23862} | 0
 1 file changed, 0 insertions(+), 0 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit e11830b2b4d3f15fd73703b5f4a7c784d09456f7
Merge: ebf4f3f82 2ea573ece
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit ebf4f3f823f5d5861ec9114ae8afa03c58074380
Merge: 87de19eff 7fcb222ab
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 87de19eff48eb698da7275e358d56b327f849602
Merge: df1bae8f0 c55a05423
Author: Nick Mathewson 
Date:   Mon Dec 11 16:43:51 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug23682   |  5 +
 src/or/directory.c |  3 +--
 src/or/main.c  | 18 +-
 3 files changed, 15 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit df1bae8f0f80addb1dafa6c9dfc22020431a42b6
Merge: 27b04b8ba 3bca705c5
Author: Nick Mathewson 
Date:   Fri Dec 1 12:13:40 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 27b04b8bad295157a92fdd59d0c3e09bc360a84a
Merge: e5e3f1364 6e3ec8222
Author: Nick Mathewson 
Date:   Fri Dec 1 09:35:43 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit f1cbb09e35b9f5fdea2aa1ebae77ed45096fc7ae
Merge: b1c543cf4 5fc0587c0
Author: Nick Mathewson 
Date:   Thu Nov 30 12:07:59 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug24313 |  5 +
 changes/trove-2017-009   | 10 ++
 changes/trove-2017-010   |  6 ++
 changes/trove-2017-011   |  8 
 changes/trove-2017-012-part1 |  6 ++
 changes/trove-2017-012-part2 |  5 +
 src/common/crypto.c  | 16 +---
 src/or/entrynodes.c  |  3 ++-
 src/or/protover.c|  5 +
 src/or/rendservice.c |  8 +++-
 src/or/routerlist.c  |  5 -
 11 files changed, 71 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 2b716e85993898f6347ff1a4b904d017b4410793
Merge: f1cbb09e3 f2ecdeb72
Author: Nick Mathewson 
Date:   Thu Nov 30 12:28:39 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit b1c543cf4d3d14132ea3a5c87b5fd8b9f32de6f0
Merge: 98b28e789 766d0a2d9
Author: Nick Mathewson 
Date:   Thu Nov 30 11:48:12 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug21394 |  9 +
 src/or/dns.c | 23 ---
 2 files changed, 29 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 98b28e789e9daa8729e5fd85eb7be1115b6c2067
Merge: 5926f14ec b1c4ab0be
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 5926f14ecfacbcfb8c63cbd942918a496a26e27c
Merge: 7b93939c7 2d849716d
Author: Nick Mathewson 
Date:   Sat Nov 18 11:03:16 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit fa3cad363e90a0a38f553a2b2ba2719c17698d9f
Merge: f5bd987c7 fea5c8a01
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit f5bd987c7563e024d68cb5e49c181ca8ef37a774
Merge: 100ff4a92 16bdb9e36
Author: Nick Mathewson 
Date:   Mon Nov 13 11:18:02 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug23470   |  6 ++
 src/or/directory.c | 22 +++---
 2 files changed, 17 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 100ff4a9284379e8f49e52a80275d3281163afb4
Merge: f02007a3e 9092e9019
Author: Nick Mathewson 
Date:   Mon Nov 13 11:15:50 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug8185_025 |  6 ++
 src/or/relay.c  | 11 +++
 2 files changed, 17 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit f02007a3e4f999241abee19c92f662be390afac5
Merge: abff196c6 ece63105d
Author: Nick Mathewson 
Date:   Mon Nov 13 11:13:22 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/ticket21953 |  6 ++
 src/or/main.c   | 10 +-
 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit abff196c6a1e49deb7830bcebf6e03606c2eae4e
Merge: c346c892a 5348c8996
Author: Nick Mathewson 
Date:   Sat Nov 11 12:23:34 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit c346c892a42558cf748c9743c5c3ef58583875ed
Merge: 4d73ed10c f2e23d38a
Author: Nick Mathewson 
Date:   Tue Oct 31 11:43:14 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug23693 | 6 ++
 src/or/config.c  | 1 +
 2 files changed, 7 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 4d73ed10c40938d1ef1cf5628fd1840ee64df8ff
Merge: 700c654d7 6ce8cc5db
Author: Nick Mathewson 
Date:   Wed Oct 25 09:29:00 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 0ad7317107ce176bb2221f3d3128ec4b9c3e7bbc
Merge: 2244838ec 302b5f577
Author: Nick Mathewson 
Date:   Tue Oct 24 09:10:42 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 4d308789e2133261e30b0dac8c31a5517ac2fd3f
Merge: 0ad731710 7bebd1b02
Author: Nick Mathewson 
Date:   Tue Oct 24 09:11:38 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 0f1b510b60dcc5edb7332615c10097fce0d216a3
Merge: fe022f3ab 9ae4ffc07
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:48 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit fe022f3ab0727d9f245b961c6cdc4d9c46f8c9bc
Merge: 00322a9ba eac4c374e
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 00322a9ba97cf5db534b9993e6320f75d348320f
Merge: 385a44bac c93ecb818
Author: Nick Mathewson 
Date:   Mon Oct 23 09:06:34 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 385a44bac5de14aa0fab0808f5d1516d7cce4d3a
Merge: bea47fde5 783e458c0
Author: Nick Mathewson 
Date:   Mon Oct 23 08:59:11 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit bea47fde59e7748557c9d55473988141fa6420c1
Merge: 78b827467 74e8fd22c
Author: Nick Mathewson 
Date:   Mon Oct 23 08:53:25 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 78b827467903905584156ee733b92a62c70b757e
Merge: ee3d83dbf 35574d4a9
Author: Nick Mathewson 
Date:   Mon Oct 23 08:47:58 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug23081 | 8 
 src/or/ntmain.c  | 1 +
 2 files changed, 9 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit ee3d83dbf7ace00080bfa9c77e0fd236f67d1fa8
Merge: 44019d73f d29e4c059
Author: Nick Mathewson 
Date:   Mon Oct 23 08:46:29 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22349 |  9 +
 src/or/dirserv.c | 56 
 2 files changed, 53 insertions(+), 12 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 44019d73ff56fddb389509d30f0d304e78cd9939
Merge: 87b2047f9 f7f55acae
Author: Nick Mathewson 
Date:   Thu Oct 5 11:04:59 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 87b2047f9e417dc020714decc3c9a899e95cf46b
Merge: 5df265ae5 ad7db1077
Author: Nick Mathewson 
Date:   Thu Oct 5 11:03:36 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 5df265ae55f8e7b056a34b1a9006c73a584cbe80
Merge: 2db94810b dc5c9af6c
Author: Nick Mathewson 
Date:   Fri Sep 22 09:09:17 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug23610   | 4 
 src/or/hs_intropoint.c | 6 +-
 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 2db94810bf26d92525048fe998967b91d83db291
Merge: b594455dd 746410fb2
Author: Nick Mathewson 
Date:   Wed Sep 20 08:32:55 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit b594455ddd5761683a127b4d45f2cf1055cf72eb
Merge: 5cb83c942 23c5259a3
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:55 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit d9bc1cdd1c65e2b533d7d64ccc5ecf140b34412f
Merge: 881307dc7 139bda4fe
Author: Nick Mathewson 
Date:   Mon Sep 18 09:40:40 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 881307dc77a7a6ff37a669c2317ab0bd691e24d1
Merge: eebf93dfd e46849846
Author: Nick Mathewson 
Date:   Thu Sep 14 13:22:17 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 61f3fe041835adc88ac34d5ca974dd12162fb31f
Merge: fdcb065bf a971018f6
Author: Nick Mathewson 
Date:   Thu Sep 14 10:15:38 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 src/or/entrynodes.c | 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit fdcb065bf7b1002a4c5e81b345848f47562938a3
Merge: 070e82a02 dedafe95f
Author: Nick Mathewson 
Date:   Tue Sep 12 17:09:47 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug15582 |  4 
 src/test/test_util.c | 21 -
 2 files changed, 20 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 070e82a02d89f06ab83daa1a3186258f5205dde1
Merge: 9c8b07c5e 0729ba286
Author: Nick Mathewson 
Date:   Tue Sep 12 09:23:57 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 src/common/torgzip.c | 2 ++
 1 file changed, 2 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 9c8b07c5eba7f5809937fb913f851378e30e2667
Merge: c3debdfe6 2b26815e0
Author: Nick Mathewson 
Date:   Mon Sep 11 17:49:18 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22446 |  4 +++
 src/ext/csiphash.c   | 14 +-
 src/ext/ed25519/donna/modm-donna-32bit.h | 48 
 src/ext/ed25519/donna/modm-donna-64bit.h | 24 
 src/or/buffers.c |  1 +
 src/or/connection_edge.c |  1 +
 src/or/dns.c |  1 +
 src/or/relay.c   |  1 +
 8 files changed, 51 insertions(+), 43 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit c3debdfe6cef2382d4807a3f9292dd7bd87965a5
Merge: 3a7e2ce1b c894e9d3d
Author: Nick Mathewson 
Date:   Mon Sep 11 16:29:10 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22797|  4 
 src/common/compat.c | 19 ---
 2 files changed, 16 insertions(+), 7 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 3a7e2ce1b68fcd69fd2eb4d5cde1f153885f799f
Merge: 4c21daa9e f5092e711
Author: Nick Mathewson 
Date:   Fri Sep 8 08:24:47 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22644 |  5 +
 src/or/control.c | 16 
 2 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 4c21daa9e2af5b88bc93baf5e14597f5924dcecd
Merge: 923efa3db a9d4df9a0
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:01 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 923efa3db83870e7c8cf904fd36727725ef23f6d
Merge: 75e084389 b548371f7
Author: Nick Mathewson 
Date:   Thu Aug 3 09:14:12 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug23078   |  7 +++
 src/or/hs_intropoint.c | 11 ---
 2 files changed, 11 insertions(+), 7 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 75e0843893b9f050352f8a16abd1004882ff76a4
Merge: abe5b07c1 f33c96610
Author: Nick Mathewson 
Date:   Thu Aug 3 08:44:31 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit abe5b07c13bb6442c14b1b71c5df75d846095c37
Merge: c33db290a 8925e84be
Author: Nick Mathewson 
Date:   Wed Aug 2 12:29:42 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 514212ed660a85d27dc285874971636f543235f1
Merge: df16f89a8 4f7955d5d
Author: Nick Mathewson 
Date:   Tue Aug 1 14:39:08 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 33d693fc74fa157b41d4cb6c81fed9348a0da72a
Merge: 59cd24933 4d2620352
Author: Nick Mathewson <ni...@torproject.org>
Date:   Tue Aug 1 11:30:33 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

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

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

[nickm]

commit 59cd2493351940d8b4a7dcb95df8048d18fa9ff6
Merge: 93d376d8b f69797b67
Author: Nick Mathewson <ni...@torproject.org>
Date:   Tue Aug 1 11:28:40 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

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

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

[nickm]

commit 93d376d8b309f3e8c242ae562434c32cfdd0388f
Merge: 7902c2fa0 84c4a2bc3
Author: Nick Mathewson 
Date:   Tue Aug 1 11:24:09 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug20270 |  6 ++
 src/or/dirserv.c | 11 ---
 2 files changed, 14 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 7902c2fa053ee3cf06d27e373fcb2ed8022ed843
Merge: 136fb78f4 7c68b2f1a
Author: Nick Mathewson 
Date:   Tue Aug 1 11:23:00 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22245   | 5 +
 src/or/hibernate.c | 2 +-
 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 136fb78f405d78a2443f97191fa253083d7d7ac7
Merge: bc4a44e42 1d48712c2
Author: Nick Mathewson 
Date:   Tue Aug 1 11:21:19 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug18100 | 5 +
 src/or/connection_edge.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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit bc4a44e4263d1c512694798cd2a3d587c58d0e3f
Merge: 388ed4c81 9d24a352c
Author: Nick Mathewson 
Date:   Tue Aug 1 11:19:30 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 388ed4c815ebfc178fc67c5decbdc6246dbde6e5
Merge: ef1d93975 ad35e595e
Author: Nick Mathewson 
Date:   Thu Jul 27 08:23:36 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug20247 | 4 
 src/common/sandbox.c | 8 
 2 files changed, 12 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit ef1d93975163a64298ef7f662dbd8dd0551c992c
Merge: df58a97f4 7021d33b9
Author: Nick Mathewson 
Date:   Wed Jul 26 15:39:56 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 .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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit df58a97f406bddf11c667e7aeec4b272a1d1a67e
Merge: a2523196a cc4c1840a
Author: Nick Mathewson 
Date:   Wed Jul 26 15:38:48 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 .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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit a2523196a4acb18610dae147bfc385e7fa0058a0
Merge: ea5368026 18734d3b2
Author: Nick Mathewson 
Date:   Wed Jul 26 12:58:22 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug23030_029  |  7 +++
 src/common/util_bug.h | 13 +
 2 files changed, 20 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit ea5368026df29866b777e2e960bdd38e503e70c2
Merge: c90ea4ee1 3c017e823
Author: Nick Mathewson 
Date:   Wed Jul 26 12:53:38 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22915  |  3 +++
 src/common/util.c | 16 
 2 files changed, 19 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit c90ea4ee18a8acf71832d464d720e9b9e96a866a
Merge: ce2f38f f5d2f79
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:14 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit ce2f38f05449b847799e4f9982ad3507d9a56e37
Merge: 72f06fc c1afbbe
Author: Nick Mathewson 
Date:   Fri Jul 14 09:06:44 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22803   | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 72f06fc59c5c5dd30a46e2c6fae9cdb551298dee
Merge: 7ebec27 66c85cd
Author: Nick Mathewson 
Date:   Fri Jul 7 10:56:31 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 7ebec27e726487e03638b3d0a2b86e74c567d6b7
Merge: 58e39a5 2dd1e21
Author: Nick Mathewson 
Date:   Fri Jul 7 10:51:28 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 10ac393293a89f44b635d109d441709b073b2966
Merge: 036e60a 55777b3
Author: Nick Mathewson 
Date:   Wed Jul 5 16:11:48 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 src/common/util.c | 5 +++--
 1 file changed, 3 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 036e60aa6e05d703789233ba9caa35a31a02d1f0
Merge: 1fb2e46 546f5b3
Author: Nick Mathewson 
Date:   Wed Jul 5 13:43:31 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 1fb2e467d547ec27803892fa852464437d3e9192
Merge: 03539b7 8bc70a2
Author: Nick Mathewson 
Date:   Wed Jul 5 11:19:03 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22801  |  5 +
 src/common/util.c | 12 
 2 files changed, 17 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 03539b76cf23b4a119b8babf643679ebabda0dd0
Merge: 2e3c529 d9427c0
Author: Nick Mathewson 
Date:   Thu Jun 29 18:48:32 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit c552ce0e17f26ae00d781d7e7f88bf2cb530573b
Merge: 7444f2d 98ffb2e
Author: Nick Mathewson 
Date:   Thu Jun 29 16:35:46 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 7444f2daf97dc91ebb74eed90053bdddc99ec1c1
Merge: 50cc49d 52c4440
Author: Nick Mathewson 
Date:   Thu Jun 29 15:57:48 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22753   |  7 +++
 src/or/entrynodes.c| 39 ++-
 src/or/entrynodes.h|  9 +
 src/or/nodelist.c  |  2 +-
 src/or/nodelist.h  |  2 ++
 src/test/test_entrynodes.c | 19 +--
 6 files changed, 70 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 50cc49dd7f0929ece6dc116671790ad94ee6baba
Merge: 4da0fe0 4c21d4e
Author: Nick Mathewson 
Date:   Wed Jun 28 14:03:23 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug21507 | 5 +
 src/or/routerparse.c | 2 ++
 2 files changed, 7 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 4da0fe0234f2a05d1f2221fc9a2cba0bc1d1cdfe
Merge: 315667c aa5af6a
Author: Nick Mathewson <ni...@torproject.org>
Date:   Wed Jun 28 13:58:37 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

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

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

[nickm]

commit 315667c4483bdf6a7b1670051ae4a7a78bba1a55
Merge: 723f048 75c6fdd
Author: Nick Mathewson 
Date:   Wed Jun 28 13:54:12 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 src/or/directory.h | 1 -
 1 file changed, 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 723f0487e9bf19a70f50aae6a3f570a4dfa9bb06
Merge: 48ff8bb e84127d
Author: Nick Mathewson 
Date:   Wed Jun 28 13:49:28 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug21969|  3 +++
 src/or/bridges.c|  6 +-
 src/or/directory.c  |  6 --
 src/or/directory.h  |  4 +++-
 src/or/entrynodes.c | 28 
 src/or/entrynodes.h |  4 
 src/or/router.c |  3 ++-
 src/or/routerlist.c |  2 +-
 8 files changed, 50 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 48ff8bb49bc1cf3419bc9d62cd3dfd7d7cb12faa
Merge: e23084b a242d19
Author: Nick Mathewson 
Date:   Tue Jun 27 11:04:44 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit e23084bc6a9343013988d7c14c7a70b8244825ce
Merge: 1bf534c bdd267e
Author: Nick Mathewson 
Date:   Thu Jun 22 10:56:08 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22400_01 |  4 
 src/or/entrynodes.c | 36 +---
 2 files changed, 29 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 1bf534c8b37d0f1608395e9362384afb1f4f7187
Merge: b4ae31e 71c7019
Author: Nick Mathewson 
Date:   Mon Jun 19 13:52:19 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22516 | 5 +
 src/common/sandbox.c | 3 +++
 2 files changed, 8 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit b4ae31e2b7084b3a8cfcdb4e892f2c6d43aea0bc
Merge: db96d1b 493d9cd
Author: Nick Mathewson 
Date:   Fri Jun 9 09:58:46 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit db96d1b6b09afd616922723eb88be35f2f4b4fc1
Merge: 802d30d ddfb877
Author: Nick Mathewson 
Date:   Thu Jun 8 14:06:57 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 03b91ac8c9b082430ba466ef72ef0c6ca594e698
Merge: 63d0426 d389480
Author: Nick Mathewson 
Date:   Thu Jun 8 09:29:49 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/trove-2017-004  | 2 --
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 4 files changed, 3 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 63d0426af5b87f4dd0de710702728c4d737514de
Merge: 916791f 53011e3
Author: Nick Mathewson 
Date:   Thu Jun 8 09:21:15 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/trove-2017-004 | 4 ++--
 changes/trove-2017-005 | 7 +++
 src/or/relay.c | 3 ++-
 3 files changed, 11 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 916791f0bef4ce57e01051dffa96e01f3e97e889
Merge: 17c61d9 0c46dc8
Author: Nick Mathewson 
Date:   Thu Jun 8 09:17:32 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/trove-2017-004   |  8 
 src/or/connection_edge.c | 21 ++---
 2 files changed, 22 insertions(+), 7 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 9390ec043b101b765b505cd920453de58a35a8f1
Merge: 2d26802 68c3df6
Author: Nick Mathewson 
Date:   Tue Jun 6 11:34:01 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 src/or/routerkeys.c | 9 -
 1 file changed, 4 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 2d26802524135a21df8494694005e759baa66a1e
Merge: 624bccc 4ed0f0d
Author: Nick Mathewson 
Date:   Tue Jun 6 09:32:37 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 src/or/routerkeys.c | 7 ++-
 1 file 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 624bccc35e524807349086cbf95616d52c3475c7
Merge: fae8bcb ac1ddd5
Author: Nick Mathewson 
Date:   Mon Jun 5 16:35:40 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 src/test/test_link_handshake.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

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

[nickm]

commit fae8bcba9e344dd6ab5419a9019afd4947e329f0
Merge: 0e8e775 91f49bc
Author: Nick Mathewson 
Date:   Mon Jun 5 15:52:02 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22460_case1 | 16 +
 changes/bug22460_case2 |  8 +++
 src/common/tortls.c| 27 +++---
 src/common/tortls.h|  1 +
 src/or/connection_or.c | 51 --
 src/or/connection_or.h |  4 
 src/or/main.c  | 17 +-
 src/or/or.h|  6 +
 src/or/router.c|  5 +++--
 src/or/routerkeys.c| 37 +-
 src/or/routerkeys.h|  2 +-
 src/test/test_link_handshake.c | 39 +++-
 src/test/test_routerkeys.c | 20 -
 src/test/test_shared_random.c  |  4 ++--
 14 files changed, 190 insertions(+), 47 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 0e8e775a40f8d4363b476679c3b6e8f16f84af0e
Merge: 1ef8350 7c54d2f
Author: Nick Mathewson <ni...@torproject.org>
Date:   Mon Jun 5 14:49:46 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

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

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

[nickm]

commit 1ef83505db112fd123bbc43c7e8e7ba4ff77e161
Merge: 10c33a6 578a439
Author: Nick Mathewson 
Date:   Mon Jun 5 12:02:32 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 10c33a6af248fa50b42b52fe81b98546a00f442c
Merge: 2ab1de9 41ed9e9
Author: Nick Mathewson 
Date:   Mon Jun 5 09:51:48 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22466_regenerate |  8 
 src/or/routerkeys.c | 15 ---
 2 files changed, 20 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 2ab1de9f3b9001f3c88cdb9da2e4c4d75c9b5ec6
Merge: 3844579 5b33d95
Author: Nick Mathewson 
Date:   Tue May 30 13:21:17 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22447  |  3 +++
 src/or/hs_descriptor.c| 23 ---
 src/test/test_hs_descriptor.c |  5 ++---
 3 files changed, 9 insertions(+), 22 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[arma]

commit 384457912f771d39b98690c25aeea3e541dbfb28
Merge: 94b5128 83439e7
Author: Roger Dingledine 
Date:   Thu May 25 00:27:47 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22370 | 4 
 src/or/dirserv.c | 7 ++-
 2 files changed, 10 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 94b51283954e5bc8d68c8a4bc7e6c168eb82e008
Merge: 647fa4b 5c52d3c
Author: Nick Mathewson 
Date:   Mon May 22 08:32:13 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug20509 |  5 +
 src/or/dirserv.c | 11 +++
 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit 647fa4bdf4b499fbe2bb8d2f8ce127ca9134481b
Merge: bd62f78 d1340bd
Author: Nick Mathewson 
Date:   Thu May 18 12:28:34 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 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.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm]

commit bd62f78ebd10f975522e6a36fcef3f4f6c488440
Merge: 4663bec 935cd77
Author: Nick Mathewson 
Date:   Thu May 18 10:06:19 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22252  |  3 +++
 src/or/circuitstats.c | 11 ++-
 src/or/circuitstats.h |  3 +++
 src/or/config.c   |  2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

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