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

commit 0bfd1c318cdd468d2699714a36687e9cda16fabb Merge: af39c13a0 6199e27a2 Author: Nick Mathewson Date: Tue Aug 1 11:19:28 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-july2017 | 4 + src/config/geoip | 10075

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

commit af39c13a0385c9c61b3a7ffdd6362d2f86e3f44b Merge: 09618bc48 ebb441ded Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit 09618bc48884255d6d3dbc8b156fe025817d9402 Merge: 78dfa76dd 6d0af8dac Author: Nick Mathewson Date: Wed Jul 26 15:34:40 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 .travis.yml | 88

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

commit 78dfa76ddcfd72015b0454e397de9a190e4e3106 Merge: ff8c230 b47249e Author: Nick Mathewson Date: Fri Jul 7 10:51:28 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22789 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

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

commit ff8c230d7cadb6c24dcf9c121521cff976fc83a5 Merge: ccae991 0ee15c9 Author: Nick Mathewson Date: Wed Jul 5 13:42:26 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22789 | 6 ++ src/common/compat.c | 8 ++-- src/test/test_addr.c | 9

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

commit ccae991662adb3b64bdb1dcd4a942e4d1e163414 Merge: 325c507 d56f699 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 325c507a090589ada4f0a781a313214c7cfd33a0 Merge: 1a7af74 104e8fa Author: Nick Mathewson Date: Fri Jun 9 09:58:45 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-june2017 |4 + src/config/geoip | 5079

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

commit 1a7af7470fdd6173f1b876fc6fee2b171174b4ff Merge: f3804f5 ec3ce77 Author: Nick Mathewson Date: Thu Jun 8 14:05:37 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 "ours" merge to avoid version bump.

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

commit 77c5d8c73856da7f07508fc263685717bd88dbc7 Merge: fa73f59 8e439a6 Author: Nick Mathewson Date: Thu Jun 8 09:28:11 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 "ours" merge to avoid version bump.

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

commit dec7998f5c42dde955760efc72f57025a32da238 Merge: 2e5220c 56a7c5b Author: Nick Mathewson Date: Thu Jun 8 09:21:15 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/trove-2017-005 | 7 +++ src/or/relay.c | 3 ++- 2 files changed, 9

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

commit 2e5220cb8b34b614fa10102899841247e906fb7b Merge: 1a540b5 4ee48cb Author: Nick Mathewson Date: Mon Jun 5 14:38:54 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 src/or/geoip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit 1a540b579248c04eba79c3e18d022054b238f6f5 Merge: 68d6720 e3ebae4 Author: Nick Mathewson Date: Mon Jun 5 12:00:08 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22490 | 3 +++ src/or/geoip.c | 2 +- 2 files changed, 4 insertions(+), 1

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

commit 68d6720452fda2ffbc1a484672aa6d09c99f1d41 Merge: a8a860e 5207e41 Author: Nick Mathewson Date: Mon May 8 08:06:59 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-may2017 |4 + src/config/geoip | 5862

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

commit a8a860e1dac94e2194b4d073ee3245978121bbe8 Merge: 933a1e7 9d79332 Author: Nick Mathewson Date: Thu Apr 6 08:31:12 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-april2017 | 4 + src/config/geoip| 14366

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

commit 933a1e79975226c357d9d7f32be479a4868bb8d7 Merge: 884b371 4488c31 Author: Nick Mathewson Date: Wed Mar 8 10:10:29 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-march2017 | 4 + src/config/geoip| 13115

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

commit b2b604ecb4df95526a309c9ff507dff942472daa Merge: aeb299b 4bab288 Author: Nick Mathewson Date: Tue Feb 28 10:22:36 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 "ours" merge to avoid bumping version

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

commit a452b713955422e217f7056cf50cb3591830dee9 Merge: 124062e 194e310 Author: Nick Mathewson Date: Wed Feb 15 07:47:04 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug20384 | 10 ++ changes/trove-2017-001.2 | 8

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

commit 124062e84339ac16ca007a1dc3227951eadcf35b Merge: 2ce4330 f601605 Author: Nick Mathewson Date: Mon Feb 13 14:37:01 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-february2017 | 4 + src/config/geoip | 10832

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

commit c056d19323e499a0003ba9de0db2bdee9c301872 Merge: b9ef21c 85a2487 Author: Nick Mathewson Date: Tue Feb 7 10:37:31 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug16248 | 8 src/or/main.c| 55

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

commit b9ef21cf565cab46571f965fc2d3f368c7e7a1da Merge: 6b37512 e4a4224 Author: Nick Mathewson Date: Tue Feb 7 09:17:59 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bifroest | 3 +++ src/or/config.c | 4 ++-- 2 files changed, 5 insertions(+), 2

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

commit 6b37512dc76152926a16d93f2be52083cd5ae436 Merge: 05ec055 d6eae78 Author: Nick Mathewson Date: Tue Feb 7 08:54:47 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/rsa_init_bug | 7 +++ src/common/crypto.c | 4 +++- 2 files changed, 10

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

commit 332543baedcf651b75722e5d4626c62fdd24ef60 Merge: 640b402 6cb8c0f Author: Nick Mathewson Date: Tue Feb 7 08:34:08 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug18089| 6 ++ src/common/crypto.c | 10 ++ 2 files changed, 16

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

commit 640b4022324c19cf330a26b8d42b6bf7707346ce Merge: 34fdd51 053e11f Author: Nick Mathewson Date: Tue Feb 7 08:32:10 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 ___ tor-commits mailing list

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

commit 05ec055c417c80bf7b13914fade70a72f11accc5 Merge: 332543b 51675f9 Author: Nick Mathewson Date: Tue Feb 7 08:38:59 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17404| 6 ++ src/common/tortls.c | 4 2 files changed, 10

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

commit 34fdd510efc2ee66113457d3f1339f7c8ebf70c0 Merge: 39ef343 3833f67 Author: Nick Mathewson Date: Wed Jan 11 09:11:58 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-january2017 |4 + src/config/geoip | 3160

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

commit 7d3d56e59a3df16615881007a77b77e30fecb831 Merge: db58d4d 8f857c2 Author: Nick Mathewson Date: Tue Dec 20 18:19:41 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 (ours merge -- there is a separate 0.2.5 patch for 20384.)

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

commit db58d4d16ff156b8827198b2732646c73eb59f14 Merge: 3d2d3f2 0fb3058 Author: Nick Mathewson Date: Tue Dec 20 18:11:08 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug21018 | 11 +++ src/or/rendcommon.c | 6 --

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

commit 3d2d3f2b62a361552f893b85e5b0d356be0a9261 Merge: db2571b 9db47e7 Author: Nick Mathewson Date: Fri Dec 9 08:33:57 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-december2016 |4 + src/config/geoip | 6259

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

commit db2571be619530389c7ca3066cfc86b32cfc7578 Merge: 304d8f3 ea59783 Author: Nick Mathewson Date: Mon Nov 7 09:29:54 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-november2016 |4 + src/config/geoip | 4025

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

commit d95c2809b39fc45b7c30b0f29284bae7384c7224 Merge: 19078b1 79939c6 Author: Nick Mathewson Date: Tue Jul 19 12:31:20 2016 +0200 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-july2016 |4 + src/config/geoip | 4615

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

commit 304d8f3bbbf063c2ee504568dde134296a2025ca Merge: e4d82da 1b4984f Author: Nick Mathewson Date: Thu Oct 6 09:58:54 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-october2016 | 4 + src/config/geoip | 63919

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

commit 46754d608110fce07fb286365b67209b35397194 Merge: d95c280 1410947 Author: Nick Mathewson Date: Fri Aug 12 10:26:48 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-august2016 | 4 + src/config/geoip | 14009

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

commit e4d82da05b11a78da4858050b6d1e8d922842ca3 Merge: 46754d6 56f95ba Author: Nick Mathewson Date: Wed Sep 7 13:53:43 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-september2016 | 4 + src/config/geoip| 30846

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

commit 19078b1b89ff7db5ceb917d34b2d152f73027334 Merge: 9d3de77 6b8c3d2 Author: Nick Mathewson Date: Tue Jul 5 13:51:34 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/19271 | 2 ++ 1 file changed, 2 insertions(+)

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

commit 9d3de77d4d76bbec8dfe8c53b0586171ab4b8ec1 Merge: f25f7b7 7ae34e7 Author: Nick Mathewson Date: Tue Jul 5 12:20:42 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 src/or/config.c | 2 -- 1 file changed, 2 deletions(-) diff --cc src/or/config.c index

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

commit f25f7b759c0c3aa2ba333fcf2dd2ad89c5187eef Merge: 3681463 c14c662 Author: Nick Mathewson Date: Mon Jun 13 10:48:35 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-jun2016 |4 + src/config/geoip | 3349

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

commit 368146370b699781334a8f380d764b3246881f52 Merge: 34a51d1 3c2d461 Author: Nick Mathewson Date: Mon May 9 14:55:22 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-may2016 |4 + src/config/geoip | 6991

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

commit ce289e2cb5099a4abe4468049dc0d262b65bfa17 Merge: f06d9a9 ad95d64 Author: Nick Mathewson Date: Thu Feb 11 12:55:40 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug18162 | 7 +++ src/common/container.c | 29

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

commit 34a51d162153f12d34f2445c6efa72dc4f6ddcd8 Merge: 21f9829 97c6e71 Author: Nick Mathewson Date: Thu Apr 7 10:45:32 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-april2016 |4 + src/config/geoip| 3255

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

commit 21f9829e793fd9074c568bee548e345536df Merge: ce289e2 8e2640b Author: Nick Mathewson Date: Wed Mar 9 10:36:20 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-march2016 |4 + src/config/geoip| 8496

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

commit f06d9a9cef036fc4da995f3ffda8e7a7770d0b74 Merge: 9ca3295 d5ac79e Author: Nick Mathewson Date: Fri Feb 5 08:13:13 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-february2016 |4 + src/config/geoip | 2144

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

commit 432852577000ab5eb07ae3ca961a36e5f6e796ba Merge: e8e89fd b0867fe Author: Nick Mathewson Date: Tue Dec 8 09:38:48 2015 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17781 |3 +++ src/or/connection_edge.c |2 +- 2 files changed, 4

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

commit c3d11b119dbd46fa02a1e26d76ddc74424dd4b18 Merge: 4328525 35deb4d Author: Nick Mathewson Date: Tue Dec 8 10:20:14 2015 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17772|7 +++ src/or/routerlist.c | 10 -- 2 files changed,

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

commit e8e89fd7a180ec54a8bdc4de09b69a4dc8f38f7d Merge: 3569cff dbb919c Author: Nick Mathewson Date: Mon Dec 7 10:10:21 2015 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-december2015 |4 + src/config/geoip | 4547

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

commit 87576e826f5f60d13478bb9de642be0e6f5533a1 Merge: be0e262 288b3ec Author: Roger Dingledine a...@torproject.org Date: Sat Sep 20 16:50:32 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 Conflicts: src/or/config.c changes/bug13100 |3 +++ src/or/config.c |

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

commit 29a82b5a8b6d5e75a1f8b880933c2a232458d386 Merge: 2126fea 68a2e4c Author: Roger Dingledine a...@torproject.org Date: Mon Jul 28 02:47:15 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug1038-3 |6 ++ changes/bug12718 |5 + src/or/command.c | 20

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

commit 1ed77ff72dec9bd2493d7d28fdd21869bcff Merge: a3d8ffe 1b55182 Author: Roger Dingledine a...@torproject.org Date: Thu Jul 24 19:48:37 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug12227 |5 + 1 file changed, 5 insertions(+)

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

commit a4c641cce91acb673f81db2b6093fde425039eaf Merge: 5c200d9 71c62b1 Author: Roger Dingledine a...@torproject.org Date: Thu Jul 24 16:23:08 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/ticket12688 |6 ++ doc/tor.1.txt |8 ++-- src/or/config.c