commit 4ced3b59aad0fffd653869d486bb0f4b1c26b19f
Merge: 6ae9769 de2c5ad
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Wed Mar 4 15:19:43 2015 +0100
Merge remote-tracking branch 'origin/maint-0.2.6'
changes/bug15127 | 3 ---
src/common/include.am | 1 -
src/or/include.am | 1 -
3 files changed, 5 deletions(-)