]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.8' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Mon, 18 Sep 2017 18:40:22 +0000 (14:40 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 18 Sep 2017 18:40:22 +0000 (14:40 -0400)
commit42e12a3537fef04ab77defd6cb5581add439de43
tree2ccccf68b6bcc95442f99c8535ae390c48724670
parenta57f1ff7abdd61137c579d806bcd2150fd5fecf6
parent0a72d1c8f1b1a92b829a93f28e43ca3c6f74e526
Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" to avoid version bump.