]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Tue, 2 Jan 2018 15:09:44 +0000 (10:09 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 2 Jan 2018 15:09:44 +0000 (10:09 -0500)
commit6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3
treeff130240363dc1bbb69c1143c18f42e65dee681b
parent79a50afa0e3dd44fc5ef80806ccda501fab5a718
parent09b9a35c07a35c0891f8cb10406c113155740d18
Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9
src/or/policies.c