[tor-commits] [tor/release-0.2.6] Merge branch 'release-0.2.6' of ssh://git-rw.torproject.org/tor into release-0.2.6

commit 2f17b91ae2ca622294bf63dec2a6986756685702 Merge: b616aea 3761711 Author: Andrea Shepard <andrea@persephoneslair.org> Date: Wed Jun 10 14:59:13 2015 +0000 Merge branch 'release-0.2.6' of ssh://git-rw.torproject.org/tor into release-0.2.6 ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)