]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.6'
authorNick Mathewson <nickm@torproject.org>
Sun, 12 Jul 2015 17:34:22 +0000 (13:34 -0400)
committerNick Mathewson <nickm@torproject.org>
Sun, 12 Jul 2015 17:34:22 +0000 (13:34 -0400)
commit6b80ff1b45c6c60a28dcbd40cdc3ab9cb421ed81
tree679518c1c7c3d0debfe0d42472b00c756405256f
parentde397d57c9ea06ca3e0bba13f393cd9208611cb7
parent3d0c09019f0564278f61a5f494adcc0ce2436fda
Merge remote-tracking branch 'origin/maint-0.2.6'

This is an "ours" merge to avoid bumping the version number in master.