user/asn/tor - George's Tor repository

	Commit message (Expand)	Author	Age
*	squash! Remove duplicate code between parse_{c,s}method in transport.cticket-6236	George Kadianakis	2018-02-24
*	Remove duplicate code between parse_{c,s}method in transport.c	Deepesh Pathak	2018-02-24
*	Merge remote-tracking branch 'mikeperry/bug24769'	Nick Mathewson	2018-02-14
\|\
\| *	Changes file for bug24769.	Mike Perry	2018-01-31
\| *	Bug 24769: Reduce and parameterize the max number of cbt circs.	Mike Perry	2018-01-31
\| *	Bug 24769: Reduce and parameterize the cbt learning idle timeout.	Mike Perry	2018-01-31
* \|	Merge branch 'tests_rust'	Nick Mathewson	2018-02-13
\|\ \
\| * \|	Add a "make test-rust" target to run the rust tests only.	Nick Mathewson	2018-02-08
* \| \|	Merge branch 'maint-0.3.2'	Nick Mathewson	2018-02-13
\|\ \ \
\| * \ \	Merge branch 'maint-0.3.1' into maint-0.3.2	Nick Mathewson	2018-02-13
\| \|\ \ \
\| \| * \ \	Merge branch 'maint-0.2.9' into maint-0.3.1	Nick Mathewson	2018-02-13
\| \| \|\ \ \
\| \| \| * \| \|	fix make check-changes	Taylor Yu	2018-02-13
* \| \| \| \| \|	Merge remote-tracking branch 'dgoulet/ticket24902_029_05'	Nick Mathewson	2018-02-13
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Make check-changes happy	David Goulet	2018-02-13
\| * \| \| \| \| \|	man: Document default values if not in the consensus for DoS mitigation	David Goulet	2018-02-13
\| * \| \| \| \| \|	Merge remote-tracking branch 'dgoulet/bug25223_029_01' into ticket24902_029_05	David Goulet	2018-02-13
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	dos: Don't set consensus param if we aren't a public relay	David Goulet	2018-02-13
\| * \| \| \| \| \| \|	dos: Add extra safety asserts in cc_stats_refill_bucket()	David Goulet	2018-02-13
\| \|/ / / / / /
* \| \| \| \| \| \|	Remove 25170 changes file from master: it was already merged in 0.3.3.2-alpha	Nick Mathewson	2018-02-13
* \| \| \| \| \| \|	Merge branch 'maint-0.3.2'	Nick Mathewson	2018-02-13
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'maint-0.3.1' into maint-0.3.2	Nick Mathewson	2018-02-13
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge branch 'maint-0.2.9' into maint-0.3.1	Nick Mathewson	2018-02-13
\| \| \|\ \ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \|
\| \| \| * \| \| \|	dirserv: Improve returned message when relay is rejected	David Goulet	2018-02-13
* \| \| \| \| \| \|	Merge remote-tracking branch 'dgoulet/ticket24902_029_05'	Nick Mathewson	2018-02-13
\|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Have tor_addr hashes return a randomized hash for AF_UNSPEC.	Nick Mathewson	2018-02-12
\| * \| \| \| \| \|	Fix a typo in an address_set.c comment.	Nick Mathewson	2018-02-12
* \| \| \| \| \| \|	Merge branch 'maint-0.3.2'	Nick Mathewson	2018-02-12
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'maint-0.3.1' into maint-0.3.2	Nick Mathewson	2018-02-12
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge branch 'maint-0.2.9' into maint-0.3.1	Nick Mathewson	2018-02-12
\| \| \|\ \ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \|
\| \| \| * \| \| \|	Merge branch 'bug23318-redux_029' into maint-0.2.9	Nick Mathewson	2018-02-12
\| \| \| \|\ \ \ \
* \| \| \| \ \ \ \	Merge branch 'maint-0.3.2'	Nick Mathewson	2018-02-11
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'maint-0.3.1' into maint-0.3.2	Nick Mathewson	2018-02-11
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Merge branch 'maint-0.2.9' into maint-0.3.1	Nick Mathewson	2018-02-11
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / /
\| \| \| * \| \| \| \|	Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9	Nick Mathewson	2018-02-11
\| \| \| \|\ \ \ \ \
* \| \| \| \ \ \ \ \	Merge branch 'maint-0.3.2'	Nick Mathewson	2018-02-11
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch 'maint-0.3.1' into maint-0.3.2	Nick Mathewson	2018-02-11
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / /
\| \| * \| \| \| \| \| \|	Merge branch 'maint-0.2.9' into maint-0.3.1	Nick Mathewson	2018-02-11
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / /
\| \| \| * \| \| \| \| \|	Merge branch 'ticket24315_029' into maint-0.2.9	Nick Mathewson	2018-02-11
\| \| \| \|\ \ \ \ \ \
* \| \| \| \ \ \ \ \ \	Merge branch 'maint-0.3.2'	Nick Mathewson	2018-02-11
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge branch 'maint-0.3.1' into maint-0.3.2	Nick Mathewson	2018-02-11
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / /
\| \| * \| \| \| \| \| \| \|	Merge branch 'maint-0.2.9' into maint-0.3.1	Nick Mathewson	2018-02-11
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / /
\| \| \| * \| \| \| \| \| \|	Merge remote-tracking branch 'public/bug21074_029' into maint-0.2.9	Nick Mathewson	2018-02-11
\| \| \| \|\ \ \ \ \ \ \
* \| \| \| \ \ \ \ \ \ \	Merge remote-tracking branch 'isis/bug25127_redux'	Nick Mathewson	2018-02-11
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	rust: Replace two `unwrap()`s in FFI code with `unwrap_or()`s.	Isis Lovecruft	2018-02-10
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	fix compilation.	Nick Mathewson	2018-02-11
* \| \| \| \| \| \| \| \| \| \|	chnages file for 25120	Nick Mathewson	2018-02-11
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'bug25120'	Nick Mathewson	2018-02-11
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Lower log-level in different error conditions in entropy selection.	Alexander Færøy	2018-02-11
\| * \| \| \| \| \| \| \| \| \| \|	Slightly different wording for error cases around entropy source selection.	Alexander Færøy	2018-02-01
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'maint-0.3.2'	Nick Mathewson	2018-02-10
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|