Merge branch 'bug15823_025' into maint-0.2.5
commit8aa04408fb724d55e95419ec9f0568c7d733acb5
authorNick Mathewson <nickm@torproject.org>
Wed, 13 May 2015 15:03:05 +0000 (13 11:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 13 May 2015 15:03:05 +0000 (13 11:03 -0400)
tree1bc1f2fc39c8b65908c0b141d61bd8d059006e33
parent6c7720ed49623f649aa6280606c129ee153b04ed
parent2b27ce52d2b96a91410fbf8e9c6f2ce7cf036961
Merge branch 'bug15823_025' into maint-0.2.5