summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-01-11 12:39:37 -0500
committerNick Mathewson <nickm@torproject.org>2018-01-11 12:39:37 -0500
commit751595551afb6282d952c482a11db35daf3736ab (patch)
tree2669f69fab6c4913f7113bfcc85b773da065461f /src/or/main.c
parentc349bfec36ccb31a202e1ad0421b3fb1a3e4ee16 (diff)
parent93e7b837c83f8188abb701749c04063998affa61 (diff)
downloadtor-751595551afb6282d952c482a11db35daf3736ab.tar.gz
tor-751595551afb6282d952c482a11db35daf3736ab.zip
Merge branch 'simplify_transition_allowed'
Diffstat (limited to 'src/or/main.c')
0 files changed, 0 insertions, 0 deletions