commit 6a8550fa3c1a435a5c6d3759b893b10f1899e570 Merge: a1bdb6e 5ad47aa Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 4 12:15:10 2015 +0100

Merge remote-tracking branch 'origin/maint-0.2.6'

Makefile.am | 2 +- changes/bug15037 | 4 ++++ changes/bug15127 | 3 +++ changes/bug15151 | 3 +++ src/common/include.am | 1 + src/or/connection_edge.c | 2 +- src/or/include.am | 1 + 7 files changed, 14 insertions(+), 2 deletions(-)