]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Fri, 9 Oct 2015 14:12:59 +0000 (10:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 9 Oct 2015 14:12:59 +0000 (10:12 -0400)
commit3569cffe1441e2e8c754feffcdc229e9a2680d0d
tree302a025db9e1075e64cbea736f4db9108910e1d3
parent809217e6f3665e20718a406871585fa932dd4578
parent62b02a1941c6c51efe36f804ddd10f62a3606d41
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5