Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8
commite247093e0efba100ec6f3abdfa9d3433d51389f0
authorNick Mathewson <nickm@torproject.org>
Fri, 1 Apr 2016 12:10:58 +0000 (1 08:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 1 Apr 2016 12:10:58 +0000 (1 08:10 -0400)
treea455843b1793dd710efae7603f7c787ebf09b466
parentba87f5bb25cd001ab8560f23a88e60a504c7059a
parentb79d8590c914c394e3edb3bfab5a39fc649fe071
Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8
src/or/directory.c