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

commit a877241e6c50cff72503a0179d8e4a9ed6216d57 Merge: 2485f8dea 56857291b Author: Nick Mathewson Date: Wed Jan 31 14:33:46 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25105 | 5 + src/or/routerparse.c | 2 +- 2 files changed, 6

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

commit 2485f8dea4182cf96696ef3e1b170337a41a5e39 Merge: c35416ab8 1c39d969b Author: Nick Mathewson Date: Wed Jan 31 13:47:01 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24975 | 6 ++ src/or/networkstatus.c | 16 2

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

commit c35416ab8fbb360fded3db875eb252ba1a9b3273 Merge: 8dc3b5ff3 df312b3cf Author: Nick Mathewson Date: Wed Jan 31 12:51:45 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24976 | 5 + src/or/hs_cache.c | 4 ++-- 2 files changed, 7

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

commit 8dc3b5ff3aa3e78d2834c4ffdaf711d4849e24c3 Merge: da2daa8e5 9bfb6fe39 Author: Nick Mathewson Date: Wed Jan 31 10:06:49 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/consdiffmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit da2daa8e5e6149b81a3c859db3be6409956c8857 Merge: 3d7f134be cb90defba Author: Nick Mathewson Date: Wed Jan 31 10:01:13 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/consdiffmgr.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)

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

commit 3d7f134bea38b94a2454dcabe0ce6d32dbbd3059 Merge: 6b629d309 e81896add Author: Nick Mathewson Date: Wed Jan 31 09:50:24 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24859 | 4 src/or/consdiffmgr.c | 5 - 2 files changed, 8

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

commit 6b629d30953b02857131f0f41fcb13964c0b33b3 Merge: 677bebda7 ee5c624be Author: Nick Mathewson Date: Wed Jan 31 09:19:55 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24972 | 4 src/or/hs_client.c | 6 --

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

commit 677bebda7005ca9df960a4691c58f2cebb05035f Merge: 03eb2037d 6ba2881ae Author: Nick Mathewson Date: Wed Jan 24 12:09:07 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25005 | 4 src/test/test_scheduler.c | 1 + 2 files changed,

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

commit 03eb2037d11d2014044d9cc90f19d0d35e6045bf Merge: 698334eee 129456e22 Author: Nick Mathewson Date: Fri Jan 19 16:30:53 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24895 | 8 src/or/hs_circuit.c | 7 ++-

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

commit 698334eee7252c533882972aa8c734e3b674edaf Merge: c9b4ddc88 e2aacf100 Author: Nick Mathewson Date: Fri Jan 19 10:18:59 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 .travis.yml | 35 +++ 1 file changed, 31

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

commit c9b4ddc882c93984359172e3e50f785080751558 Merge: 4bfc35579 44388757c Author: Nick Mathewson Date: Thu Jan 18 08:13:48 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24826_031 | 4 src/or/consdiff.c| 5 - 2 files changed, 8

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

commit 4bfc3557990c2b06cfb008c8a2af277df2ea40ba Merge: b1267114c 4e653ac2c Author: Nick Mathewson Date: Wed Jan 17 11:12:33 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24898 | 8 src/or/command.c | 6 --

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

commit b1267114cf5bf311a48f06b7eefb4c12c6b872d2 Merge: 7e9676782 f02c6bcad Author: Nick Mathewson Date: Wed Jan 17 10:50:58 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24894| 5 + src/or/hs_circuit.c | 2 +- 2 files changed, 6

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

commit 7e96767825f2c6bd60c1c4beae98e5158b1bdc15 Merge: dbea64aab 0cb89eb82 Author: Nick Mathewson Date: Tue Jan 16 13:35:55 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 Makefile.am | 3 ++- changes/bug24652 | 6 ++ configure.ac | 11

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

commit dbea64aab67d2471653a6f8ce2b974e68df2ed11 Merge: 01d6e23f7 db5aa54a4 Author: Nick Mathewson Date: Thu Jan 11 20:00:43 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24526| 4 doc/tor.1.txt |

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

commit 01d6e23f767a029cc77cbe59b80046fcaad8401e Merge: 9e8b762fc 34c6034aa Author: Nick Mathewson Date: Tue Jan 9 10:13:54 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

commit 58474f7bb1e13ca61a0e52f13d8502cc334813bb Merge: 5ff2d8d77 1f7f930f9 Author: Nick Mathewson Date: Mon Jan 8 11:39:48 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

commit 5ff2d8d7706f1f1d7790185b76ddfc8a7c575e01 Merge: efba81e3b 1c5c5f0e5 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

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

commit efba81e3bb53ede274cbb139a15f318aab681d42 Merge: 0d172c118 748ad2124 Author: Nick Mathewson Date: Mon Jan 8 09:35:55 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 0d172c1182bacb3c6d7e4538df87e706b720be30 Merge: 8edc0be74 5f2c7a856 Author: Roger Dingledine Date: Fri Jan 5 18:26:14 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/common/crypto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

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

commit 8edc0be74baf61d5bd3db92106c83241289525c0 Merge: c7c043d2b 3618bd616 Author: Nick Mathewson Date: Fri Jan 5 16:41:35 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket24681 | 6 ++ doc/tor.1.txt | 3 ++- src/or/config.c | 9

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

commit c7c043d2b6f42893c220dbb2fd1991f4a34683b6 Merge: 1a070767d 9ef97a268 Author: Nick Mathewson Date: Wed Jan 3 10:08:48 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24634 | 3 +++ src/or/hs_common.c| 14 +++---

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

commit 1a070767de0c50aed86f5fc3dc04324e03ef3d32 Merge: 99b4f8683 451c852a0 Author: Nick Mathewson Date: Wed Jan 3 09:00:00 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24633 | 5 + src/ext/timeouts/timeout-bitops.c | 4

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

commit 99b4f868332b3ae304e669240657994022d69991 Merge: fd46d8d0a 2aa1767b2 Author: Nick Mathewson Date: Tue Jan 2 14:42:31 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/config/torrc.minimal.in-staging | 6 +- src/config/torrc.sample.in |

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

commit fd46d8d0ad9e976cdae7676e9f27f572b78ac959 Merge: 11336cfa0 707076002 Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8

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

commit 11336cfa0997709176bc912fde71338eaeab3851 Merge: 63b84335d 94c59851d Author: Nick Mathewson Date: Thu Dec 21 14:23:06 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2

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

commit 63b84335dc590499e5f22498383d6a3432e91ec4 Merge: afacaa02a 1a7779966 Author: Nick Mathewson Date: Thu Dec 21 12:42:22 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2

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

commit 0d1a2e366acd98fcece78c8b4734c5507059c366 Merge: 29e23e62c 6cd567d79 Author: Nick Mathewson Date: Thu Dec 21 11:16:00 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24671| 6 ++ src/or/scheduler_kist.c | 22

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

commit 29e23e62c9be846ce68210d72448cf955a239d8c Merge: 88642bbdc 84adb9fcc Author: Nick Mathewson Date: Thu Dec 21 10:58:20 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

commit 2a7cad957263f5faed3a0b9de8b15d9794a5541c Merge: c2b64ad09 885ba513f Author: Nick Mathewson Date: Thu Dec 21 10:20:35 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24665| 6 ++ src/or/scheduler_kist.c | 22

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

commit 88642bbdc783d8616ba779dbd33378e2c4e09501 Merge: 2a7cad957 c38157be9 Author: Nick Mathewson Date: Thu Dec 21 10:27:39 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/scheduler_kist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

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

commit c2b64ad0968f040e2b5ecb426d3520a02acb5cc7 Merge: 748f0abc2 7e45720cf Author: Nick Mathewson Date: Wed Dec 20 12:15:24 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/geoip-2017-12-06 | 4 + src/config/geoip | 12380

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

commit 748f0abc2d6b1c2da41d269882aabdcf5819b1ab Merge: 2824413f4 565ec6100 Author: Nick Mathewson Date: Wed Dec 20 11:19:23 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/common/tortls.c | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-)

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

commit 2824413f40e20bb1c02eb6e180208eca203645f3 Merge: 64c88c719 0a1b1430c Author: Nick Mathewson Date: Wed Dec 20 10:39:38 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/test/test_hs_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

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

commit 64c88c71995b5320d3951496b9b8f01ed2cf4a7b Merge: 4f8a0ed62 fc33caada Author: Nick Mathewson Date: Wed Dec 20 09:59:51 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket24425 | 4 src/or/hs_common.h | 2 +- 2 files changed, 5

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

commit 0f105d69fc79aae00df305a7a76a74652ebab947 Merge: 2b48b5363 5c4da2cac Author: Nick Mathewson Date: Thu Dec 14 14:12:49 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2

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

commit 0834f4d93dc808bc2f01350635719551762fee69 Merge: 4c015d9fe ca8e9813b Author: Nick Mathewson Date: Wed Dec 13 12:07:46 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 .gitignore | 1 + 1 file changed, 1 insertion(+)

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

commit 4c015d9fe4abf54f5e3d8929fa62b916789e158f Merge: 37fba82c1 93b3c4b84 Author: Nick Mathewson Date: Wed Dec 13 12:06:52 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2

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

commit 37fba82c155dda2ba5d4b3bdd63ea4cd54f264ee Merge: dc9f2cdf7 15b41fa6a Author: Nick Mathewson Date: Tue Dec 12 19:46:53 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24424 | 3 +++ src/common/sandbox.c | 5 + 2 files changed, 8

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

commit dc9f2cdf73a4a55288f2321aa78b72ea188fedec Merge: dd5ca2505 bf89b0893 Author: Nick Mathewson Date: Tue Dec 12 19:27:14 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24367 | 13 + src/or/bridges.c | 38

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

commit dd5ca2505599dee6a589e228b69c4e8d4f29d7e6 Merge: 706e6893d cf5ab5934 Author: Nick Mathewson Date: Tue Dec 12 09:32:29 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/hs_service.c | 50 +- 1 file

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

commit 58f974818c6fc9452bbdbe78d82ed10bdcbbae7e Merge: 2cfb7b041 4593f5a6e Author: Nick Mathewson <ni...@torproject.org> Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 _______ tor-commits mailing li

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

commit 706e6893d16e2097d9da4511060372c21f1cd24b Merge: 58f974818 4c54021ba Author: Nick Mathewson Date: Tue Dec 12 09:13:12 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23682 | 5 - 1 file changed, 5 deletions(-)

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

commit 2cfb7b0413d7f1e0b3c5004c8c2877c53b39244b Merge: a14ff6b9c 43fb8fc5c Author: Nick Mathewson <ni...@torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 _______ tor-commits mailing list tor-c

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

commit a14ff6b9c71ee4891b9c992821a63d2df09fcd38 Merge: d77e82769 e553bf3ce Author: Nick Mathewson <ni...@torproject.org> Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 _______ tor-commits mailing list tor-c

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

commit d77e8276935e30bbfdada832de5c274c216872fa Merge: ca554b22f bfc9be4c7 Author: Nick Mathewson <ni...@torproject.org> Date: Mon Dec 11 16:50:48 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 _______ tor-commits mailing list tor-c

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

commit ca554b22f850da93d26c18119e0e251a58c6072e Merge: fdd13697d dc79d5299 Author: Nick Mathewson <ni...@torproject.org> Date: Mon Dec 11 16:46:00 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 _______ tor-commits mailing list tor-c

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

commit fdd13697d537bc699253a2bc53cc31ce5473eca4 Merge: 4fc402496 acc462c96 Author: Nick Mathewson Date: Mon Dec 11 16:43:51 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23682 | 5 + changes/stack| 7 +++

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

commit 4fc402496eb21fc46edfe162c911da9679fd5d28 Merge: 68ec14dc1 057139d38 Author: Nick Mathewson Date: Mon Dec 11 16:02:10 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24590| 5 + src/or/scheduler_kist.c | 11 +++ 2 files

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

commit 68ec14dc180a46a6d148235a75fc93e7c8fe9657 Merge: cd084c203 d68abbe35 Author: Nick Mathewson Date: Mon Dec 11 09:45:17 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23603 | 7 src/or/circuitlist.c | 30

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

commit cd084c2036d19b344bae2bf4d920e6a3256fd7fb Merge: 0c7a540ba 4b41ffa64 Author: Nick Mathewson Date: Thu Dec 7 08:42:56 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug18859| 7 +++ src/or/circuituse.c | 6 +- 2 files changed, 12

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

commit 0c7a540ba27f08de800f3fbd1f21332e7519ec53 Merge: 92d45086f d4ca18573 Author: Nick Mathewson Date: Wed Dec 6 14:38:06 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24502 | 4 src/or/scheduler_kist.c | 5 -

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

commit 92d45086f5f82995fd179f27ab93bda7f80b50b8 Merge: bc30d3053 779e4b9dc Author: Nick Mathewson Date: Tue Dec 5 12:10:06 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket24500 | 3 +++ src/common/crypto.c | 13 +++-- 2 files changed,

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

commit bc30d30534fedd8868d29d56f8d3b17935e7ffed Merge: 19e01f0cb a5be2305e Author: Nick Mathewson Date: Mon Dec 4 14:01:55 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23696 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit 19e01f0cbcdf09ddcbf9a54ce3a3d601f42ea7a9 Merge: fe12c9756 ff6c8cf86 Author: Nick Mathewson Date: Mon Dec 4 13:23:52 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23696| 5 + src/or/scheduler_kist.c | 8 ++-- 2 files

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

commit fe12c9756aa6c3ba6f943ea2549dc8ab3332 Merge: e0d1ab417 b86c9acac Author: Nick Mathewson Date: Fri Dec 1 12:13:40 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4

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

commit e0d1ab41723ac0cbc1b8f23d3235f1edc6b0e239 Merge: 87012d076 909c91049 Author: Nick Mathewson Date: Fri Dec 1 09:35:43 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

commit 9eb17cb7ba85283acd7be686b2e5b2aa7b89bdf2 Merge: c981cd431 424ab08b5 Author: Nick Mathewson Date: Thu Nov 30 12:28:39 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2

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

commit c981cd431146b9c67b8e38e661cf856fa5399fcb Merge: 500975da9 fd73a168c Author: Nick Mathewson Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24313 | 5 + changes/trove-2017-009 | 10 ++

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

commit 500975da96f27037c9339ef18d474106af892478 Merge: 1e715efb7 25d50decb Author: Nick Mathewson <ni...@torproject.org> Date: Thu Nov 30 11:48:12 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 _______ tor-commits mailing list tor-c

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

commit 1e715efb7780c8a697a598ff2c3d03c7daca4340 Merge: 9a9d32fab f0007f2b8 Author: Nick Mathewson Date: Wed Nov 29 12:06:14 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

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

commit 9a9d32fabc0899b50d1b06c37892b9eb556ee2cb Merge: fa7261254 9b44bb49b Author: Nick Mathewson Date: Wed Nov 29 12:02:44 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24050 | 5 + src/or/config.c | 3 +-- 2 files changed, 6

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

commit fa726125402ffdd1084f46f82bf74aba162dbc2e Merge: 36806e983 ef5461044 Author: Nick Mathewson Date: Mon Nov 27 10:04:15 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2

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

commit 36806e9830688973257f1f669ef8a751fa55757b Merge: d084d3246 4bb287aa3 Author: Nick Mathewson Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bastet_v6 | 4 src/or/config.c | 1 + 2 files changed, 5 insertions(+)

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

commit d084d3246b1e8cc4438287382abc86655b103601 Merge: d499a5a70 a7e777ab8 Author: Nick Mathewson Date: Wed Nov 22 08:34:48 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2

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

commit e4b68abd5accdf41c71644eb728ca42991bf632a Merge: c6365055a 5da6120e8 Author: Nick Mathewson Date: Tue Nov 21 12:54:47 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2

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

commit c6365055a1bf5a20cd17dd2b134ab7bfa2365ae3 Merge: b9be385fd ba94dc28e Author: Nick Mathewson Date: Tue Nov 21 12:41:39 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24086| 7 +++ changes/bug24099| 4

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

commit b9be385fd686dd46ff51a403a0c2ac1d23c9002a Merge: e343cb8f6 da82e0b57 Author: Nick Mathewson Date: Mon Nov 20 14:35:26 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/entrynodes.c | 30 ++ src/or/entrynodes.h | 2 +-

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

commit e343cb8f631dbbad2fbe9814d558ac06bc46a8e8 Merge: 1bd83c2ec e2d8300c1 Author: Nick Mathewson Date: Mon Nov 20 14:25:17 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23783 | 5 + configure.ac | 2 +- 2 files changed, 6

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

commit 1bd83c2ec846764a52f4fd001662f7fb1a1a43f8 Merge: 909645449 846df5b3c Author: Nick Mathewson Date: Mon Nov 20 13:22:10 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24198 | 4 +++ changes/ticket24315 | 3 ++ configure.ac |

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

commit 9096454492c527acb7e72a655c3d5bd3d2ae8d52 Merge: e74229efc e0f7a2dbd Author: Nick Mathewson Date: Mon Nov 20 08:39:39 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23681| 5 + src/or/circuituse.c | 18 -- 2 files

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

commit e74229efc48d82a567fe91ebee6170d5bb9161aa Merge: 41a3eaf2f 65a6103af Author: Nick Mathewson <ni...@torproject.org> Date: Sat Nov 18 11:03:16 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 _______ tor-commits mailing list tor-c

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

commit 41a3eaf2fc6d3b7fd56a61a77b5e5c8d386bb18f Merge: 9afa66192 d45bf0c65 Author: Nick Mathewson Date: Sat Nov 18 10:27:29 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/test/test_entrynodes.c | 2 ++ 1 file changed, 2 insertions(+)

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

commit 9afa6619244c214d4e192f5e67dcc961c7d69107 Merge: cf92667b9 a5b8b55c1 Author: Nick Mathewson Date: Sat Nov 18 10:23:52 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24345 | 3 +++ src/test/test_config.c | 7 +-- 2 files changed,

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

commit cf92667b9ffb427f85584f95bc8fea389ab31885 Merge: 330ccb699 9c17a6d28 Author: Nick Mathewson Date: Fri Nov 17 09:59:26 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23817 | 3 + src/or/directory.c | 82

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

commit 330ccb699ed445f661fe04cad7917d7346ad1615 Merge: b2e191001 b98614f1a Author: Nick Mathewson Date: Fri Nov 17 09:26:11 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket24158 | 3 +++ changes/ticket24254 | 3 +++ doc/tor.1.txt | 34

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

commit b2e1910017ca19783871877456205aa4a0bee4a6 Merge: 00aeecb39 85778dc92 Author: Nick Mathewson Date: Fri Nov 17 09:23:07 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23861 | 5 + src/or/directory.c | 2 +- 2 files changed, 6

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

commit 00aeecb397a65b3687a01fbe7b33773ccbbac158 Merge: b9826ba45 3a364309a Author: Nick Mathewson Date: Fri Nov 17 08:35:56 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11

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

commit b9826ba4518852b9fa8057ab40921f3082916a03 Merge: 066904e75 057101581 Author: Nick Mathewson Date: Fri Nov 17 08:35:04 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket24097 | 4 src/or/dns.c| 5 +++-- 2 files changed, 7

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

commit 066904e758c689533eff6b682c994551c6e574b6 Merge: 2367b1ed3 0684e6c6f Author: Nick Mathewson Date: Fri Nov 17 08:34:08 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug20963 | 4 src/or/circuitstats.c | 11 --- 2 files

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

commit 2367b1ed319a138c40708f511cd6d5575109cece Merge: 01c5d4583 56b7407a9 Author: Nick Mathewson Date: Wed Nov 15 15:11:30 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24279 | 5 + configure.ac | 2 +- 2 files changed, 6

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

commit 01c5d4583f3bc33c2c00b16ea269a2b03f5ac55e Merge: 7d1e47559 ae8683621 Author: Nick Mathewson Date: Wed Nov 15 14:25:25 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23662 | 4 src/or/directory.c | 9 + 2 files changed, 9

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

commit 7d1e47559a391be46cd137e0580ee91b5026a94a Merge: 349a92bf3 6dc784bdb Author: Nick Mathewson Date: Tue Nov 14 14:45:11 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24230 | 4 src/or/control.c | 2 +- 2 files changed, 5 insertions(+),

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

commit 349a92bf3f57ae3d5f8cdfa09570bfc6e6577a89 Merge: 8473424ed 6059784be Author: Nick Mathewson <ni...@torproject.org> Date: Mon Nov 13 20:36:04 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 _______ tor-commits mailing list tor-c

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

commit 8473424ede44053f3986330b5f80c36ff12e3162 Merge: ab8013391 985c41b50 Author: Nick Mathewson Date: Mon Nov 13 16:58:21 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket23637 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit ab8013391ed7391739cb88efc10d22baeb7f10d3 Merge: 08d933a79 05ae99566 Author: Nick Mathewson <ni...@torproject.org> Date: Mon Nov 13 12:57:58 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 _______ tor-commits mailing list tor-c

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

commit 08d933a7942434613418430cbe3c81d9fb4febb7 Merge: a71552268 d0b75b5ad Author: Nick Mathewson Date: Mon Nov 13 12:27:44 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24262 | 3 +++ src/or/hs_common.c | 2 +- 2 files changed, 4

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

commit a71552268dc5918d5c1b23eca45eb07330a68f54 Merge: 5ea9a48ae 3300a6e93 Author: Nick Mathewson Date: Mon Nov 13 11:20:23 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket23637 | 5 + src/or/policies.c | 13 - 2 files

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

commit 5ea9a48ae7acd0d4c6180d13e71570dbb9ef6a6f Merge: 4bd9c5323 cf1e6ad2d Author: Nick Mathewson Date: Mon Nov 13 11:19:12 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24247 | 6 ++ src/test/fuzz/fuzzing_common.c | 5 +++--

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

commit 4bd9c53237d96c8bb154433595ac87c5db9194b4 Merge: a8c388b0e 6f9ab69b6 Author: Nick Mathewson <ni...@torproject.org> Date: Mon Nov 13 11:18:02 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 _______ tor-commits mailing list tor-c

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

commit a8c388b0e2f40dc1c32cdf2e76008538eb046322 Merge: ad90a136b 7dddef2a7 Author: Nick Mathewson <ni...@torproject.org> Date: Mon Nov 13 11:15:50 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 _______ tor-commits mailing list tor-c

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

commit ad90a136b2dc25e73d1c668c9284e7ddf748dfe9 Merge: 55aafbf7b 441bfcd88 Author: Nick Mathewson <ni...@torproject.org> Date: Mon Nov 13 11:13:22 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 _______ tor-commits mailing list tor-c

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

commit 55aafbf7baafb1935c25adb313047822946d48b2 Merge: 6a8c1667d 512dfa15e Author: Nick Mathewson Date: Sat Nov 11 12:23:34 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/geoip-2017-11-06 |4 + src/config/geoip | 9406

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

commit 6a8c1667df7114711a387c3f60989a02d594dcc0 Merge: 57deb20f3 aa1d90b40 Author: Nick Mathewson Date: Thu Nov 9 08:17:46 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23985| 9 + src/or/routerlist.c | 5 + 2 files changed, 14

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

commit 57deb20f357eac5fe0a8467d6dd8ef9a10050808 Merge: 7cbda1181 40c64f45f Author: Nick Mathewson Date: Thu Nov 9 08:02:36 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/config.c | 5 - 1 file changed, 5 deletions(-)

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

commit 7cbda1181deec55984e7b60a795082daf65d3d25 Merge: 940308f49 c8859582a Author: Nick Mathewson Date: Wed Nov 8 16:45:15 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

commit c5b16c141336025908ccc420b7a4f4b3fc38a7cb Merge: 388b1d0fa b84b00817 Author: Nick Mathewson Date: Wed Nov 8 14:59:18 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/dirvote.c | 9 - src/or/dirvote.h | 7 +++ 2 files changed, 15

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

commit c99fec4999a31a56cd6a6cf573c589c5cd690830 Merge: d37bc7287 61330f40a Author: Nick Mathewson Date: Wed Nov 8 13:26:50 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 README | 3 +++ src/or/dirvote.c | 2 +- 2 files changed, 4 insertions(+), 1

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

commit 04714df9cc2a20f7daae498baee99c5dbf3c4432 Merge: e50da3327 02f05f2de Author: Nick Mathewson Date: Wed Nov 8 11:02:51 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23318| 11 +++ changes/bug23751| 6 ++

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

commit 94752b3fa6b133cda02465b24890b3d218cb1fd8 Merge: 059c441d2 e5a83062e Author: Nick Mathewson Date: Wed Nov 8 08:13:14 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23816| 6 + src/or/directory.c | 76

<    1   2   3   >