From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 18 Jan 2015 18:49:04 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5'
X-Git-Tag: tor-0.2.6.3-alpha~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcf8cddab25e5b189eaebf473423c2b31acb4525;p=thirdparty%2Ftor.git

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

Conflicts:
	src/test/test_relaycell.c
	src/test/test_util.c
---

dcf8cddab25e5b189eaebf473423c2b31acb4525