Nick Mathewson c6ac752353 Merge remote-tracking branch 'origin/maint-0.2.5'

2014-12-23 11:00:02 -05:00

..

bug13808

changs file for 13808

2014-12-23 10:59:48 -05:00

bug14013

whoops; missing changes file for 14013

2014-12-23 10:55:25 -05:00