diff options
| author | Andrea Shepard <andrea@persephoneslair.org> | 2012-10-10 18:53:38 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@persephoneslair.org> | 2012-10-10 18:53:38 -0700 |
| commit | 8b36d4cc2ab95acd4c2c7203afb29a051a38c5c9 (patch) | |
| tree | 92eabec1394092735e8b6e47f664f0094b76e6be /src/or/reasons.c | |
| parent | ec97319464aab204740acb013b504abb0e13d989 (diff) | |
| parent | bd28322d3815a03ca04beb6d00052d613dbe226f (diff) | |
| download | tor-8b36d4cc2ab95acd4c2c7203afb29a051a38c5c9.tar.gz tor-8b36d4cc2ab95acd4c2c7203afb29a051a38c5c9.zip | |
Merge branch 'bug6816_squashed_nowarn' of git://git.torproject.org/nickm/tor
Diffstat (limited to 'src/or/reasons.c')
| -rw-r--r-- | src/or/reasons.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/reasons.c b/src/or/reasons.c index c51d8ee6f5..a04cd869a2 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -323,8 +323,8 @@ circuit_end_reason_to_control_string(int reason) return "CONNECTFAILED"; case END_CIRC_REASON_OR_IDENTITY: return "OR_IDENTITY"; - case END_CIRC_REASON_OR_CONN_CLOSED: - return "OR_CONN_CLOSED"; + case END_CIRC_REASON_CHANNEL_CLOSED: + return "CHANNEL_CLOSED"; case END_CIRC_REASON_FINISHED: return "FINISHED"; case END_CIRC_REASON_TIMEOUT: |