32150 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Mathewson	1d44ac9acd	Make nodelist_get_list() return a const pointer.	2019-04-26 10:36:49 -04:00
Nick Mathewson	efeb101b96	Merge remote-tracking branch 'tor-github/pr/889'	2019-04-25 20:25:34 -04:00
Nick Mathewson	36b4fc7437	Merge remote-tracking branch 'tor-github/pr/922'	2019-04-25 20:08:39 -04:00
George Kadianakis	974c2674eb	Merge branch 'maint-0.4.0'	2019-04-25 15:47:07 +03:00
George Kadianakis	a39789a02c	Merge branch 'tor-github/pr/960' into maint-0.4.0	2019-04-25 15:46:45 +03:00
George Kadianakis	811a93f803	Merge branch 'tor-github/pr/953'	2019-04-25 15:43:47 +03:00
Nick Mathewson	6320b2988c	Merge remote-tracking branch 'tor-github/pr/942'	2019-04-24 17:06:56 -04:00
Nick Mathewson	0cbe0f9cab	Merge remote-tracking branch 'tor-github/pr/964'	2019-04-24 17:05:20 -04:00
Nick Mathewson	d0a0f3e8cd	Allow do_resolve() to be longer.	2019-04-24 14:15:18 -04:00
David Goulet	f39dd0a700	Merge branch 'tor-github/pr/951'	2019-04-24 09:53:15 -04:00
David Goulet	608cf2ba8d	Merge branch 'tor-github/pr/943'	2019-04-24 09:51:14 -04:00
David Goulet	5bcf87c224	Merge branch 'tor-github/pr/955'	2019-04-24 09:45:32 -04:00
David Goulet	4b599aaae4	Merge branch 'tor-github/pr/939'	2019-04-24 09:43:28 -04:00
David Goulet	4587e67dfd	Merge branch 'tor-github/pr/930'	2019-04-24 09:39:32 -04:00
Nick Mathewson	15d4238383	Merge remote-tracking branch 'tor-github/pr/944'	2019-04-23 15:39:23 -04:00
Nick Mathewson	8bea0c2fa3	Rename outvar to follow _out convention.	2019-04-23 14:14:17 -04:00
Nick Mathewson	475ac11bc1	Merge remote-tracking branch 'tor-github/pr/935'	2019-04-23 14:11:04 -04:00
Nick Mathewson	6559aefc7b	Merge remote-tracking branch 'tor-github/pr/971'	2019-04-23 12:52:54 -04:00
Nick Mathewson	b0459de217	Merge branch 'ticket30051_take2_squashed'	2019-04-23 12:51:44 -04:00
rl1987	0c78811cea	Add changes file	2019-04-23 12:51:29 -04:00
rl1987	a85cd5b41b	Call practracker from pre-push and pre-commit hooks	2019-04-23 12:51:29 -04:00
Nick Mathewson	a7599c5be2	Merge remote-tracking branch 'tor-github/pr/962'	2019-04-23 12:48:37 -04:00
teor	9a97b5ff56	Travis: Show stem's tor log after failure ... Closes ticket 30234.	2019-04-22 11:48:07 +10:00
Neel Chauhan	2ab19a48c2	Initialize rate_limited in hs_pick_hsdir() to false	2019-04-19 09:50:54 -04:00
Neel Chauhan	efde686aa5	Only set rate_limited in hs_pick_hsdir() if rate_limited_count or responsible_dirs_count is greater than 0	2019-04-19 09:21:20 -04:00
Neel Chauhan	144bc5026e	Initialize rate_limited to false in directory_get_from_hs_dir()	2019-04-19 09:17:29 -04:00
Neel Chauhan	943559b180	Make rate_limited and is_rate_limited a bool	2019-04-19 08:33:00 -04:00
teor	4b8c77a590	Merge branch 'maint-0.4.0'	2019-04-19 12:00:59 +10:00
teor	24b68b4777	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-04-19 12:00:50 +10:00
teor	231036a110	Merge branch 'maint-0.3.4' into maint-0.3.5	2019-04-19 12:00:41 +10:00
teor	cbce8dedd3	Merge branch 'maint-0.2.9' into maint-0.3.4 ... "ours" merge, to avoid taking any changes from PR 792 in 0.3.4. (We already merged PR 791 for 29665 into 0.3.4.)	2019-04-19 11:59:18 +10:00
teor	742b5b32d5	Merge remote-tracking branch 'tor-github/pr/710' into maint-0.3.5	2019-04-19 11:52:48 +10:00
teor	cb084de5e5	Merge remote-tracking branch 'tor-github/pr/726' into maint-0.3.5	2019-04-19 11:51:05 +10:00
teor	2ae67fee42	Merge remote-tracking branch 'tor-github/pr/745' into maint-0.3.5	2019-04-19 11:48:41 +10:00
teor	4a66c2d636	Merge remote-tracking branch 'tor-github/pr/947' into maint-0.3.5	2019-04-19 11:47:50 +10:00
teor	116970dda7	Merge remote-tracking branch 'tor-github/pr/946' into maint-0.3.4	2019-04-19 11:47:10 +10:00
teor	b1762f8d12	Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4	2019-04-19 11:44:38 +10:00
teor	8154b33f9c	Merge remote-tracking branch 'tor-github/pr/791' into maint-0.3.4	2019-04-19 11:43:46 +10:00
teor	2460b4461f	Merge remote-tracking branch 'tor-github/pr/792' into maint-0.2.9	2019-04-19 11:42:09 +10:00
teor	4d504bf098	Merge branch 'maint-0.2.9' into maint-0.3.4 ... "ours" merge, to avoid taking any changes from PR 772 in 0.3.4. (We already merged a different fix for 23790 into 0.3.2 and later.)	2019-04-19 11:39:17 +10:00
teor	ec213ae8a0	Merge remote-tracking branch 'tor-github/pr/772' into maint-0.2.9	2019-04-19 11:38:52 +10:00
teor	bffba9d26f	practracker: accept more lines in microdescs_parse_from_string() ... Part of 28223.	2019-04-19 10:34:16 +10:00
George Kadianakis	78223ab0fc	Merge branch 'tor-github/pr/938'	2019-04-18 13:23:32 +03:00
George Kadianakis	2db9bb02c7	Merge branch 'tor-github/pr/925'	2019-04-18 13:22:54 +03:00
George Kadianakis	d867b7ae1d	Merge branch 'maint-0.4.0'	2019-04-18 13:22:23 +03:00
George Kadianakis	6a179b1072	Merge branch 'tor-github/pr/891' into maint-0.4.0	2019-04-18 13:21:59 +03:00
Neel Chauhan	caa55a6d37	Grammar fixes for IPv6Exit in tor.1.txt	2019-04-17 21:41:31 -04:00
Neel Chauhan	cfada969a9	Update tor.1 man page for IPv6Exit	2019-04-17 07:26:55 -04:00
rl1987	0d88b808e9	Remove contrib/dist/tor.sh.in	2019-04-17 13:15:02 +03:00
teor	f12b990bbf	practracker: accept the extra 25 line string from 27821	2019-04-17 18:44:26 +10:00