aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerparse.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-09-17 10:50:48 -0400
committerNick Mathewson <nickm@torproject.org>2012-09-17 10:50:48 -0400
commit32d9cea2892f79d8f16adcc5ae417980af33f082 (patch)
tree98db1c92c70225c5604d7a994f6a217908c47f37 /src/or/routerparse.c
parent5511d21d2b99fb686f3ad57be1a16d383f77adc9 (diff)
parent414adb237bc51e0e1b7321364dd73d9b3e635733 (diff)
downloadtor-32d9cea2892f79d8f16adcc5ae417980af33f082.tar.gz
tor-32d9cea2892f79d8f16adcc5ae417980af33f082.zip
Merge remote-tracking branch 'public/bug6853'
Diffstat (limited to 'src/or/routerparse.c')
-rw-r--r--src/or/routerparse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 43a95e88c1..8502ff2bf6 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -2101,7 +2101,7 @@ routerstatus_parse_entry_from_string(memarea_t *area,
for (i=0; i < tok->n_args; ++i) {
int p = smartlist_string_pos(vote->known_flags, tok->args[i]);
if (p >= 0) {
- vote_rs->flags |= (1<<p);
+ vote_rs->flags |= (U64_LITERAL(1)<<p);
} else {
log_warn(LD_DIR, "Flags line had a flag %s not listed in known_flags.",
escaped(tok->args[i]));