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

2017-12-21 Thread nickm
commit 3b08184338fd9b0b3e3bd3e5260684cd078beae0 Merge: c604a76a5 7d845976e Author: Nick Mathewson Date: Thu Dec 21 10:43:12 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-20 Thread nickm
commit c604a76a53204eb20af0fab0a9f1f49fba393fd9 Merge: eecfed0cd 877dd1d6c Author: Nick Mathewson Date: Wed Dec 20 12:15:23 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-2017-12-06 | 4 + src/config/geoip | 12380

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

2017-12-12 Thread nickm
commit eecfed0cd2c8c92175106e211d1662fa43fc60bc Merge: eaaa1108a f7151387d Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

2017-12-11 Thread nickm
commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874 Merge: 7e486dd6f bc1ea4f47 Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +-

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

2017-12-01 Thread nickm
commit 953a8f851081e6157e9296186c296ab10106b7eb Merge: 495db72c1 f97f301b5 Author: Nick Mathewson Date: Fri Dec 1 12:13:40 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4

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

2017-12-01 Thread nickm
commit 495db72c1eee7f9ed890ae252eb5b61a70438065 Merge: 73869c99a dc3890439 Author: Nick Mathewson Date: Fri Dec 1 09:35:07 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump.

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

2017-12-01 Thread nickm
commit 1fd6e25522ed064e8043f4548fbd33fca9246295 Merge: 7e2b012b4 6ee447254 Author: Nick Mathewson Date: Thu Nov 30 12:22:38 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump.

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

2017-12-01 Thread nickm
commit 7e2b012b46a4ade2818e47be15d76255cf6f121e Merge: 52d7af631 ba4a9cf0c Author: Nick Mathewson Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24313 | 5 + changes/trove-2017-009 | 10 ++

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

2017-11-27 Thread nickm
commit 30b3229252709eeca054ee06cc6e366226723e24 Merge: 53c3174ee 25c90230b Author: Nick Mathewson Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bastet_v6 | 4 src/or/config.c | 1 + 2 files changed, 5 insertions(+)

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

2017-11-18 Thread nickm
commit 53c3174ee43c3f54f8180be8256180f6f0d24c0d Merge: 1b9bb2c84 d388f9d87 Author: Nick Mathewson Date: Sat Nov 18 11:01:43 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug18329-minimal | 6 ++ src/or/router.c | 9 + 2 files

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

2017-11-13 Thread nickm
commit 543fd89fb7fe4817b5e59beb132f5331ee7a2f48 Merge: ab415ae95 800797e7f Author: Nick Mathewson Date: Mon Nov 13 12:57:58 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug23291| 3 +++ src/test/test-memwipe.c | 2 +- 2 files changed, 4

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

2017-11-11 Thread nickm
commit 9666c620d584b2c715596b415a808941b17cbda0 Merge: 04d4786cc c9b76a12f Author: Nick Mathewson Date: Sat Nov 11 12:23:33 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-2017-11-06 |4 + src/config/geoip | 9406

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

2017-10-25 Thread nickm
commit 151d5ededf9fb334a5195904945f95cf626f51bc Merge: 46091a88c faf568fa7 Author: Nick Mathewson Date: Wed Oct 25 09:28:29 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump

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

2017-10-24 Thread nickm
commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump

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

2017-10-23 Thread nickm
commit fcd5c3144a44f4081e9e7c4336b932e31ae45f77 Merge: 1db5081ba a5f5bda46 Author: Nick Mathewson Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

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

2017-10-23 Thread nickm
commit 1db5081ba1e9201673dac296957a6d8b0a694855 Merge: c958fda6e 8cc147aa8 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6

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

2017-10-23 Thread nickm
commit c958fda6e29265b12b987ee8445873c25629ae71 Merge: 132e2f69b 9a1b38546 Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4

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

2017-10-23 Thread nickm
commit 132e2f69b1068b139d3c114fddd6efe58d6fc8f4 Merge: fcaf3335b 6f87a8589 Author: Nick Mathewson Date: Mon Oct 23 08:53:25 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug23690 | 5 + src/or/circuitlist.c | 1 + 2 files changed, 6