]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Wed, 29 Jul 2015 14:48:13 +0000 (10:48 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 29 Jul 2015 14:48:13 +0000 (10:48 -0400)
commit9d86f6665aaf3ef73bf93fd4f96dd861f894c5bd
tree3172a15754c3eeab698091d036a2206515237f7a
parent9d1801b4b96d205d1896db754efbd54ecdf590d2
parent01bb260f3108688f2ca54b1eea813980dd94ea1f
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6