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

[nickm]

commit 01baad0a63780d42e01629777058c3b7f240a9bd
Merge: 1d4377996 2968c716d
Author: Nick Mathewson 
Date:   Fri Jun 29 23:12:03 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 scripts/maint/checkSpace.pl | 5 -
 1 file changed, 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 1d43779960cb02d3bd176207044c97a80696dd55
Merge: fc5242889 a3ec89a4f
Author: Nick Mathewson 
Date:   Fri Jun 29 13:49:43 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 src/test/test_channelpadding.c | 1 +
 src/test/test_hs_descriptor.c  | 3 +++
 src/test/test_shared_random.c  | 1 +
 3 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit fc5242889c921ac1322ca0b22a72f81df58d49b5
Merge: d136e91ed ea14d3408
Author: Nick Mathewson 
Date:   Fri Jun 29 13:06:15 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/ticket26467|  3 +++
 src/or/directory.c |  1 +
 src/or/hs_descriptor.c |  1 +
 src/test/hs_test_helpers.c |  6 ++
 src/test/test_channelpadding.c |  2 ++
 src/test/test_hs_descriptor.c  | 11 +--
 6 files changed, 18 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit d136e91ed7fb857c18063d01e0f3354677d50166
Merge: 4671b0573 1385a5118
Author: Nick Mathewson 
Date:   Fri Jun 29 13:00:56 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 src/or/routerlist.c   | 2 ++
 src/or/shared_random_state.c  | 1 +
 src/test/test_hs.c| 7 +--
 src/test/test_shared_random.c | 1 +
 4 files changed, 9 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 4671b05736c1c09d6d6f126f47875d18f5a06156
Merge: ac46e04fe d6d3f8486
Author: Nick Mathewson 
Date:   Tue Jun 26 09:21:59 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/feature26372_029 | 4 
 configure.ac | 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit ac46e04feaf3efd9c97a68922678214d963df322
Merge: 58ac00fce 340fcc7e2
Author: Nick Mathewson 
Date:   Sun Jun 17 19:24:48 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 .editorconfig | 33 +
 1 file changed, 33 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 34ea50b32a189d22df535ba283a1d404a263780b
Merge: 03461d5d4 94f300762
Author: Nick Mathewson 
Date:   Wed Jun 13 09:58:04 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug26158  | 5 +
 src/or/circuitbuild.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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 58ac00fce88b70de78c30a5b9ee1db051f2e1c96
Merge: 34ea50b32 9713ecfc4
Author: Nick Mathewson 
Date:   Wed Jun 13 09:59:28 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug26158 | 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 03461d5d401d9d9ddfaabd6f09648d4338460449
Merge: b86c2c178 16381b579
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit b86c2c178d0545b7afeccfd2ac88ba8ea555d233
Merge: 086459091 d84581a3e
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:56 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 086459091974830a99e97ec9a72fa3b8c8866a22
Merge: 4843d5349 19f386852
Author: Nick Mathewson 
Date:   Tue Jun 12 08:11:20 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/geoip-2018-06-07 |4 +
 src/config/geoip | 5848 +-
 src/config/geoip6|  810 ++-
 3 files changed, 4354 insertions(+), 2308 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 4843d5349dc43d7ad53346314234358053dc1d1c
Merge: 3f8fe441c 1ef8023e0
Author: Nick Mathewson 
Date:   Fri Jun 8 10:11:57 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug26196  |  4 
 src/or/protover.c | 13 +
 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 3f8fe441cfd77ceea20cb6a3f5eb76f463e6d88e
Merge: 12e465344 f48fb8a72
Author: Nick Mathewson 
Date:   Thu May 24 09:40:06 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug26116   |  7 +++
 src/common/crypto.c|  7 ++-
 src/test/test_crypto.c | 41 +
 3 files changed, 54 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 12e465344e8b69fd03e76d8247609a378d572006
Merge: 90e7364e7 d3a972561
Author: Nick Mathewson 
Date:   Wed May 16 12:11:45 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug26072 | 5 +
 src/or/relay.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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 90e7364e7e6172bdefe50151a656303776e00b93
Merge: d47da4005 502d2c006
Author: Nick Mathewson 
Date:   Tue May 15 09:32:44 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/geoip-2018-05-01 |4 +
 src/config/geoip | 5455 ++
 src/config/geoip6|  971 +++--
 3 files changed, 4468 insertions(+), 1962 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit d47da400584900193d61d8feaf874a0ff2abec13
Merge: 5fd8f3b71 2d61a8351
Author: Nick Mathewson 
Date:   Thu May 10 09:22:32 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug26069   | 5 +
 src/or/hs_descriptor.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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 5fd8f3b71d5c0d8dc9827d107215af91ecae4d78
Merge: 9ca9e6a1f ba7043921
Author: Nick Mathewson 
Date:   Thu May 10 09:19:28 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 src/test/test_dir.c | 20 
 1 file 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 9ca9e6a1f7589f48b0165eed949ede90aa8e550f
Merge: 8ddd84707 aa08c1970
Author: Nick Mathewson 
Date:   Thu May 10 08:00:35 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/ticket26062| 3 +++
 src/or/networkstatus.c | 1 -
 2 files changed, 3 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 8ddd84707e84836ecfd985647a4d5593bf151d35
Merge: 3bf89fb85 6361a250f
Author: Nick Mathewson 
Date:   Thu May 3 13:38:54 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 .travis.yml | 4 +++-
 Makefile.am | 9 +
 2 files changed, 12 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 3bf89fb85f703f406fe7f8a1d264451475e20b07
Merge: edf721f8f 993e314c6
Author: Nick Mathewson 
Date:   Wed May 2 08:46:28 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug26007 |  5 +
 src/or/dirserv.c | 13 +++--
 2 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit edf721f8f018b6a53a148c480f94a2bd4d795cc8
Merge: beaaeecd2 bb35405d2
Author: Nick Mathewson 
Date:   Wed Apr 25 08:01:53 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 src/or/router.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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit beaaeecd2057f3decb59a44318437b32e90afbf0
Merge: 3f2cf1c0f 5cc3a0379
Author: Nick Mathewson 
Date:   Tue Apr 24 10:38:37 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 .travis.yml  | 5 -
 changes/travis_distcheck | 4 
 2 files changed, 8 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 3f2cf1c0f5d027dad3d701fb264ee76300c626a2
Merge: 28dc7a519 e88863407
Author: Nick Mathewson 
Date:   Tue Apr 24 08:49:24 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug23693.1 |  4 
 src/or/config.c| 10 +-
 src/or/main.c  |  2 +-
 src/or/router.c| 21 ++---
 4 files changed, 28 insertions(+), 9 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 28dc7a519c712913b8ad0581ac9ee5f875ad27b3
Merge: 02ac1822a 5c3639923
Author: Nick Mathewson 
Date:   Mon Apr 23 09:23:31 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24969 | 3 +++
 src/common/sandbox.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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 02ac1822abe329fee343bdab145e4bacfcfc76fe
Merge: ae0ee0202 ce8e7427b
Author: Nick Mathewson 
Date:   Tue Apr 17 10:48:17 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 .travis.yml   | 9 -
 changes/coveralls | 3 +++
 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.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit ae0ee020269e439068d1a4caa99c2e0c09117ccf
Merge: 8eb9aaf4f 5e0fbd700
Author: Nick Mathewson 
Date:   Mon Apr 16 13:48:23 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 src/common/address.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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 8eb9aaf4f65affed0aa450028464a30ab06f74dd
Merge: 347b38d6d db6902c23
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:32 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 347b38d6d9dc73f0d14ff60ee8729550cea9a952
Merge: 04007557f e813116d3
Author: Nick Mathewson 
Date:   Thu Apr 5 08:36:13 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 .travis.yml | 4 ++--
 changes/ticket25714 | 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.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 04007557fb5473ad4571afe78207c114ecfaf1f0
Merge: cbea95ae6 834eef245
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit cbea95ae6736e5ec62af6b7341245a84629e3a2c
Merge: e9ec63d1a 5acfc3087
Author: Nick Mathewson 
Date:   Tue Mar 27 18:23:53 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug25629  |  3 +++
 src/or/nodelist.c | 13 ++---
 2 files changed, 9 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit e9ec63d1ac9ca1fec0f1e3fea87a48ae000ecf02
Merge: 72db4f836 068d09274
Author: Nick Mathewson 
Date:   Mon Mar 26 10:29:29 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/feature25313 |  4 
 src/common/sandbox.c | 23 ++-
 2 files changed, 6 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.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 72db4f836ac86759e69bac3e2b310cc1ca5ba81a
Merge: 35179a8c0 1aa0ae2cc
Author: Nick Mathewson 
Date:   Mon Mar 19 05:42:43 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 .travis.yml | 24 
 1 file changed, 20 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 35179a8c05810c0c0eafee82abad7450c165bd7e
Merge: 1eb7041ef 0e7f15fdb
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:03 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 1eb7041ef105af931d1eb3984aeddb2e79aa03a1
Merge: e3966d47c 0aa794d30
Author: Nick Mathewson 
Date:   Sat Mar 3 11:34:10 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit b6b239ce0c3d1ee5f7f829d8d795e489c2358948
Merge: ce9df228a d4a758e08
Author: Nick Mathewson 
Date:   Thu Mar 1 16:07:59 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug25249 |   3 +
 changes/bug25249.2   |   3 +
 changes/trove-2018-001.1 |   6 ++
 changes/trove-2018-004   |   8 +++
 src/or/protover.c|  35 --
 src/test/test_protover.c | 171 +++
 6 files changed, 220 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 19602bffbee2a2ad7de5089be6a28e6e28f0e240
Merge: babd102f0 c527a8a9c
Author: Nick Mathewson 
Date:   Thu Mar 1 16:44:31 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 60d3a3c754b7d02e7fcb5e9cb6216fdd4062c3b2
Merge: 7e2e8ac24 ac1942ac5
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 7e2e8ac245d82e3150c2965d35ddf8544f555b07
Merge: 7e4623a23 2bcd264a2
Author: Nick Mathewson 
Date:   Fri Feb 16 09:48:15 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24952|   5 +
 changes/bug25223|   4 +
 changes/ticket24902 |  13 +
 changes/ticket25122 |   4 +
 changes/ticket25202 |   4 +
 doc/tor.1.txt   |  95 ++
 src/common/address.c|  27 +-
 src/common/address.h|   2 +
 src/common/address_set.c| 129 +++
 src/common/address_set.h|  35 ++
 src/common/include.am   |   2 +
 src/common/log.c|   2 +-
 src/common/torlog.h |   4 +-
 src/or/channel.c|   9 +-
 src/or/channel.h|   3 +-
 src/or/channeltls.c |   2 +-
 src/or/command.c|  13 +
 src/or/config.c |  25 ++
 src/or/connection.c |  16 +
 src/or/dos.c| 794 
 src/or/dos.h| 140 
 src/or/geoip.c  | 205 ++--
 src/or/geoip.h  |  29 ++
 src/or/include.am   |   2 +
 src/or/main.c   |   2 +
 src/or/networkstatus.c  |  13 +-
 src/or/nodelist.c   |  78 +
 src/or/nodelist.h   |   3 +
 src/or/or.h |  33 ++
 src/or/relay.c  |  14 +-
 src/or/rendmid.c|  12 +
 src/or/status.c |   2 +
 src/test/include.am |   2 +
 src/test/test.c |  20 ++
 src/test/test.h |   2 +
 src/test/test_address_set.c | 174 ++
 src/test/test_dos.c | 497 +++
 37 files changed, 2371 insertions(+), 45 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 7e4623a2353541cfdcad02bc2b9cb05bcc7a7c81
Merge: f0f22ad92 3930ffdf6
Author: Nick Mathewson 
Date:   Fri Feb 16 08:47:41 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24898-029 |  6 ++
 src/or/command.c | 10 --
 2 files changed, 6 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.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit f0f22ad92c2a8d20d85f1689197f901dfdee3688
Merge: b9b701306 f647035b3
Author: Nick Mathewson 
Date:   Tue Feb 13 16:55:19 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug21074_downgrade | 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit b9b7013062265e0c38c4ccd564c3b2d95d298028
Merge: 0f4b1020a 17a923941
Author: Nick Mathewson 
Date:   Tue Feb 13 08:50:59 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/ticket25170 |  5 +
 src/or/dirserv.c| 10 --
 2 files changed, 13 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 0f4b1020af4a622976273383dbee1b3d3320a449
Merge: 97c988c43 91109bc81
Author: Nick Mathewson 
Date:   Mon Feb 12 08:33:47 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug23318| 11 +++
 changes/bug24170|  3 +++
 src/or/routerlist.c | 48 +++-
 3 files changed, 45 insertions(+), 17 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 97c988c4315f9ff4b4e892194bda3d640a368f7e
Merge: c93f69af5 b2c4d4e7f
Author: Nick Mathewson 
Date:   Sun Feb 11 18:11:04 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24198 |  4 
 src/common/sandbox.c | 16 +++-
 2 files changed, 19 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit c93f69af582141f846a0f7c5dfd30c293c901c58
Merge: cf55f0516 8939eaf47
Author: Nick Mathewson 
Date:   Sun Feb 11 18:09:35 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/ticket24315  |  3 +++
 configure.ac |  2 ++
 src/common/sandbox.c | 71 +---
 3 files changed, 72 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit cf55f0516c9eecc3e2779931fdba9eeb5335f569
Merge: ed13a7f62 eccef6ba6
Author: Nick Mathewson 
Date:   Sun Feb 11 16:51:56 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug21074_downgrade |  4 
 src/common/compat.c| 14 +++---
 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit ed13a7f6251723eecacfb527576dc1eb1353fe88
Merge: abd620538 86583ad78
Author: Nick Mathewson 
Date:   Sat Feb 10 16:09:01 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24978   |  7 +++
 src/common/ciphers.inc | 21 -
 src/common/tortls.c| 28 +---
 3 files changed, 52 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit abd6205384694f2e2647db0742fed7f1447ce4b5
Merge: 6f238a44d 04a8e81fa
Author: Nick Mathewson 
Date:   Thu Feb 8 10:29:06 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/geoip-2018-02-07 | 4 +
 src/config/geoip | 34364 -
 src/config/geoip6|   841 +-
 3 files changed, 28369 insertions(+), 6840 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 6f238a44d8016380cdf47c666185565149ac3b46
Merge: 6d0309e48 9cbc40e37
Author: Nick Mathewson 
Date:   Thu Feb 1 15:28:17 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug25070  | 3 +++
 src/or/protover.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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 6d0309e48b9b67cb1f0c0b3130bebfed489a44ba
Merge: d83d1c7a8 5fc0437e7
Author: Nick Mathewson 
Date:   Wed Jan 31 10:06:49 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 src/or/consdiffmgr.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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit d83d1c7a890eea5dca8c9db9c8b9b75ad2fa8f1a
Merge: 76b73013e 86e6cb640
Author: Nick Mathewson 
Date:   Wed Jan 31 10:01:13 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 src/or/consdiffmgr.c | 6 --
 1 file changed, 4 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 76b73013e29661a55cbee098c5326b57d3ec6069
Merge: 0e0baad5e 9c2bc441f
Author: Nick Mathewson 
Date:   Wed Jan 31 09:50:24 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24859 | 4 
 src/or/consdiffmgr.c | 5 -
 2 files changed, 8 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 0e0baad5e82e6b06d63ba404ccd5cfb0afa61847
Merge: c30d2daae 7f2e23e7a
Author: Nick Mathewson 
Date:   Fri Jan 19 16:30:53 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24895 |  8 
 src/or/hs_common.c   | 17 +
 src/or/hs_common.h   |  1 +
 src/or/hs_service.c  |  1 +
 src/or/rendservice.c | 10 --
 5 files changed, 35 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit c30d2daae0c520e24cad6ef4105ec52bca5ead3a
Merge: 256cd9d87 483a59ec2
Author: Nick Mathewson 
Date:   Fri Jan 19 10:18:59 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 .travis.yml | 35 +++
 1 file changed, 31 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 256cd9d8777aac7cb8fd6028ef518fdcf8ab744d
Merge: 83648ef07 f406b9df0
Author: Nick Mathewson 
Date:   Thu Jan 18 08:13:48 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 2 files changed, 8 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 83648ef077d7972f27d82e22b9189af8202b2264
Merge: f9fe48989 af8cadf3a
Author: Nick Mathewson 
Date:   Wed Jan 17 11:12:33 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24898   | 8 
 src/or/command.c   | 6 --
 src/or/connection_or.c | 6 ++
 3 files changed, 14 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit f9fe48989be0a770a36c9af935c73edfec031ba7
Merge: 0e5140320 e3ab27001
Author: Nick Mathewson 
Date:   Mon Jan 8 11:10:36 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 0e5140320bfb4517b3bc971f77e3348d31756329
Merge: e9a102ff5 a1ce1ab20
Author: Nick Mathewson 
Date:   Mon Jan 8 09:34:57 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit e9a102ff5e5a9bd4864baad95352168002be414d
Merge: ed304a052 48d94e290
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit ed304a052f0d6575495999e516e464d34ea5f0e2
Merge: a8a060cdb c1d98c75e
Author: Nick Mathewson 
Date:   Wed Jan 3 09:00:00 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit a8a060cdb329eff865928da5a5e19fa4f6cba021
Merge: 45b1c6bc8 fb5877b97
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 45b1c6bc8ba66a98608b5ebfaf22685a0623df31
Merge: 40faebd45 08469a338
Author: Nick Mathewson 
Date:   Thu Dec 21 10:58:20 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 40faebd45bff486911b1fe2ba6f5e221c65d9fe9
Merge: 1723138fc 5e9264671
Author: Nick Mathewson 
Date:   Wed Dec 20 12:15:24 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit bda3c544478f40270d60fbe93e4d8703a1c5ff5e
Merge: ee1bbe21a cdee62da9
Author: Nick Mathewson 
Date:   Mon Dec 11 16:56:31 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit ee1bbe21ab74873b498b143728c17334cbd3ce5e
Merge: b63cbec65 04524443d
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit b63cbec65e33602af5ba3e310b87fddb4ad75ab5
Merge: 74ce41d4d 736e7299c
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 74ce41d4d4ca12a65813b18e7d6a1c61ee3cf14a
Merge: 2edad42fd f7b41bcdf
Author: Nick Mathewson 
Date:   Mon Dec 11 16:50:48 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24086|  7 +++
 changes/bug24099|  4 
 src/common/storagedir.c | 25 +
 src/or/conscache.c  | 17 ++---
 src/or/consdiffmgr.c| 13 +++--
 5 files changed, 57 insertions(+), 9 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 2edad42fd8afa243c0261d1907e50e43329e6392
Merge: fbb74fb37 d2031f2c6
Author: Nick Mathewson 
Date:   Mon Dec 11 16:45:59 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug23817   |   3 ++
 src/or/directory.c |  40 ++--
 src/or/directory.h |   7 ++-
 src/or/entrynodes.c| 121 -
 src/or/entrynodes.h|  39 +++-
 src/or/microdesc.c | 101 +
 src/or/microdesc.h |   6 ++-
 src/or/networkstatus.c |   3 ++
 8 files changed, 280 insertions(+), 40 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit fbb74fb37cc0497be2e88e35787cc314f04c6478
Merge: 24f769832 ae608408e
Author: Nick Mathewson 
Date:   Mon Dec 11 16:43:51 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 24f7698320689e758d3bc7a8dac34988fc8a98b9
Merge: d3048a8f5 5c03bb7c0
Author: Nick Mathewson 
Date:   Fri Dec 1 12:13:40 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit d3048a8f5b1db2179dee4c30c1ad3d94f1972363
Merge: 9703b4148 7fae562a4
Author: Nick Mathewson 
Date:   Fri Dec 1 09:35:43 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit d8d52f2b73eca2cfa868d157bdb66d5ba1be5c30
Merge: 14746dfba ee48eb1eb
Author: Nick Mathewson 
Date:   Thu Nov 30 12:07:59 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 94ad23deb216651844ab31c17809afa2fc8f9da1
Merge: d8d52f2b7 4ebd43654
Author: Nick Mathewson 
Date:   Thu Nov 30 12:28:39 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 14746dfba26aaac0a2b89a371e26b98e1211cb11
Merge: 7c548437c 500f04a74
Author: Nick Mathewson 
Date:   Thu Nov 30 11:48:12 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 7c548437cc774880b314ae2d01d7b8fab009d397
Merge: bedd32e5d 703ab95e9
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit bedd32e5d1988409ad431f9191aba7fe818a6767
Merge: 3c0150aa4 735855952
Author: Nick Mathewson 
Date:   Sat Nov 18 11:03:16 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 3c0150aa46658366bcfe2e65ed53d6a075d42698
Merge: 70fcbd5f8 1d5e693b6
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 70fcbd5f8336b8d435309b2b84906abdf91a8a96
Merge: d96f7f38e 562b3c967
Author: Nick Mathewson <ni...@torproject.org>
Date:   Mon Nov 13 12:57:58 2017 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

_______
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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit d96f7f38e855dd8912389058a0a5759b9e5c0d02
Merge: 5355b99dc 7df28ce29
Author: Nick Mathewson 
Date:   Mon Nov 13 12:26:46 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24262   | 3 +++
 src/or/hs_common.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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 5355b99dc0f9e4c69213dc3db244c01b65e80384
Merge: 5c9841166 91188540a
Author: Nick Mathewson 
Date:   Mon Nov 13 11:18:02 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 5c98411663c8545a197f4962134a2dfd092e21b1
Merge: fe5d607d6 89b9951ec
Author: Nick Mathewson 
Date:   Mon Nov 13 11:15:50 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit fe5d607d6be22336b86b4999f42791e9ac6fc46a
Merge: ba1db0c79 2777b469f
Author: Nick Mathewson <ni...@torproject.org>
Date:   Mon Nov 13 11:13:22 2017 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

_______
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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit ba1db0c797ce2b752bcf6cdf636d92e638142651
Merge: fb1c191e5 ef9251157
Author: Nick Mathewson 
Date:   Sat Nov 11 12:23:34 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit fb1c191e54e1c19b1beec90ed1bcd3bc135bf4b8
Merge: 6155f7669 5a21b2708
Author: Nick Mathewson 
Date:   Tue Oct 31 11:43:14 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 6155f7669132165b71080663a83a914a7b8d8017
Merge: 987f628b7 7c2f688fb
Author: Nick Mathewson 
Date:   Wed Oct 25 09:29:00 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 4a49e134bc30ff1ab4693cffc9d88ad993758889
Merge: ee70e2ed6 990322fca
Author: Nick Mathewson <ni...@torproject.org>
Date:   Tue Oct 24 09:11:38 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

_______
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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit ee70e2ed6df64c10099350ec654dff65db21011c
Merge: af51ac47e 38a58076e
Author: Nick Mathewson 
Date:   Tue Oct 24 09:10:42 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit ebedb5e06f68b102711477997c3e04ccece0e12d
Merge: 602f9565a f0a6ea0bf
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:48 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 602f9565a932354c543353f5ab38079a8707b2ad
Merge: 5f78775a8 af33fdd7c
Author: Nick Mathewson 
Date:   Mon Oct 23 09:22:57 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug23908   |  3 +++
 src/or/directory.c | 10 --
 2 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.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 5f78775a8a1d1155fc14231c5a416ab23d3a02ab
Merge: 11abdccc7 85115796b
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 11abdccc752a1caf5c522deb589231c6b5557e33
Merge: 2fee12a96 23e3d57e1
Author: Nick Mathewson 
Date:   Mon Oct 23 09:06:34 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 2fee12a96aa8fd09872d04da05e8bcc86dbe16d1
Merge: 919286be0 df57d1e0c
Author: Nick Mathewson 
Date:   Mon Oct 23 08:59:11 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 919286be0557072941ad374e52ec8e75014838b4
Merge: adb7b92ca b68de63eb
Author: Nick Mathewson 
Date:   Mon Oct 23 08:53:25 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit adb7b92ca33e20fc40531ddcfe8360d333ba639d
Merge: af5454e01 9120ac221
Author: Nick Mathewson <ni...@torproject.org>
Date:   Mon Oct 23 08:47:59 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

_______
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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit af5454e01c5dd231a9dba6579e3c2ceb26d248e2
Merge: ecc84d878 5d37d2700
Author: Nick Mathewson <ni...@torproject.org>
Date:   Mon Oct 23 08:46:29 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

_______
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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit ecc84d87809f4f099772b3cb93626f2b1eaea545
Merge: db4651469 7a4741c23
Author: Nick Mathewson 
Date:   Thu Oct 5 11:04:59 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit db4651469de43c06944fb5e27235a4a2bb4a4f81
Merge: 29b459a63 bdf60fc7c
Author: Nick Mathewson 
Date:   Thu Oct 5 11:03:36 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 29b459a637a49325087bce35b557ebfce5637945
Merge: 2074984c3 82f109c2b
Author: Nick Mathewson 
Date:   Thu Sep 28 18:54:18 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug23551  | 3 +++
 src/common/compress.c | 7 +++
 2 files changed, 10 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 2074984c34d346dec04614e2609c7694f8aa8aa7
Merge: e2ddc8b54 9b0264181
Author: Nick Mathewson <ni...@torproject.org>
Date:   Fri Sep 22 09:09:17 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

_______
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.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit e2ddc8b547847164f958938725f65ac491959e32
Merge: 5bf84b1f0 7f3dc8327
Author: Nick Mathewson 
Date:   Thu Sep 21 14:39:04 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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

[nickm]

commit 5bf84b1f00e29a647c1734948d89c15c8a603225
Merge: 7ef22d0bf d70a793cf
Author: Nick Mathewson 
Date:   Thu Sep 21 10:39:10 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug23608   |  4 
 src/test/test_channelpadding.c | 43 +++---
 2 files changed, 40 insertions(+), 7 deletions(-)

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