commit 5ad47aafabfdb9718b4beb7c3893af58a9147e2e Merge: 2d926d0 930ab95 Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 4 12:14:17 2015 +0100

Merge remote-tracking branch 'public/bug15127_025' into maint-0.2.6

changes/bug15127 | 3 +++ src/common/include.am | 1 + src/or/include.am | 1 + 3 files changed, 5 insertions(+)